Merge "Fix DCAE plugin log formatting"

[optf/has.git] / run-dockers.sh

diff --git a/run-dockers.sh b/run-dockers.sh
index 569957c..e618983 100755 (executable)
--- a/run-dockers.sh
+++ b/run-dockers.sh
@@ -4,8 +4,7 @@
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.1.1"
-STAGING="1.1.1-STAGING"
+VERSION="1.3.3"
 PROJECT="optf-has"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}"
@@ -51,6 +50,7 @@ function get_from_arguments_or_default(){
         exit 0;
     fi
 }
+
 #conductor.conf
 if [ -z "$1" ]
   then
@@ -80,7 +80,7 @@ fi
 #aai_ca_bundle.pem
 if [ -z "$5" ]
   then
-    get_from_arguments_or_default 'aai_ca_bundle.pem' 5
+    get_from_arguments_or_default './AAF_RootCA.cer' 5
 fi
 
 echo Value is .... $COND_CONF $LOG_FILE
@@ -90,5 +90,5 @@ docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $
 docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
 docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-solver --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