diff options
Diffstat (limited to 'docker')
-rwxr-xr-x | docker/docker-entrypoint.sh | 6 | ||||
-rwxr-xr-x | docker/instance_config.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 48211cad..9f0c9937 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -30,7 +30,11 @@ done # Wait for DB initialization echo "Wait for DB initialization" for i in {1..5}; do - curl -sS -m 1 $MYSQL_ADDR > /dev/null && break + curl -sS -m 1 $MSB_PROTO:$MSB_ADDR/msb -k > /dev/null + res=$i? + if [ $res -ne 0 ]; then + break + fi sleep $i done diff --git a/docker/instance_config.sh b/docker/instance_config.sh index 509cc8dc..32c6395d 100755 --- a/docker/instance_config.sh +++ b/docker/instance_config.sh @@ -1,5 +1,6 @@ #!/bin/bash +MSB_PROTO=`echo $MSB_PROTO` MSB_IP=`echo $MSB_ADDR | cut -d: -f 1` MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2` @@ -7,6 +8,10 @@ if [ $MSB_IP ]; then sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py fi +if [ $MSB_PROTO ]; then + sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" vfc/nfvo/catalog/catalog/pub/config/config.py +fi + if [ $MSB_PORT ]; then sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/catalog/catalog/pub/config/config.py fi |