Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed certificate to use to connect to AAI
[demo.git]
/
boot
/
oof_vm_init.sh
diff --git
a/boot/oof_vm_init.sh
b/boot/oof_vm_init.sh
index
67975b4
..
241c484
100644
(file)
--- a/
boot/oof_vm_init.sh
+++ b/
boot/oof_vm_init.sh
@@
-2,7
+2,7
@@
CERT=/opt/optf-has/aai_cert.cer
KEY=/opt/optf-has/aai_key.key
CERT=/opt/optf-has/aai_cert.cer
KEY=/opt/optf-has/aai_key.key
-BUNDLE=/opt/optf-has/
aai_bundle.pem
+BUNDLE=/opt/optf-has/
AAF_RootCA.cer
NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
@@
-16,7
+16,7
@@
COND_CONF=/opt/optf-has/conductor.conf
LOG_CONF=/opt/optf-has/log.conf
#!!! THE FOLLOWING LINE IS A PLACEHOLDER !!!
LOG_CONF=/opt/optf-has/log.conf
#!!! THE FOLLOWING LINE IS A PLACEHOLDER !!!
-AAI_cert=/usr/local/bin/
aai_cert
.cer
+AAI_cert=/usr/local/bin/
AAF_RootCA
.cer
IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has"
IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has"
@@
-193,7
+193,7
@@
docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_
docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
-docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/
bundle.pem
${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
+docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/
AAF_RootCA.cer
${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
sleep 10
sleep 10