From 719e0d9fa0c9fc1f5d7da336b7618adaf2616d2e Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 21 Feb 2019 10:47:55 +0800 Subject: [PATCH] Update SDC env injection Issue-ID: VFC-1260 Change-Id: I72e489f3ded66d4f1a1a1b4ac5ced16a986eccfa Signed-off-by: yangyan --- docker/docker-entrypoint.sh | 12 ------------ docker/instance_config.sh | 3 --- 2 files changed, 15 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 2bc14169..0a277fae 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -17,18 +17,6 @@ if [ -z "$MYSQL_ADDR" ]; then fi echo "MYSQL_ADDR=$MYSQL_ADDR" -if [ -z "$SDC_USER" ]; then - echo "Missing required variable SDC_USER" - exit 1 -fi -echo "SDC_USER=$SDC_USER" - -if [ -z "$SDC_PASSWD" ]; then - echo "Missing required variable SDC_PASSWD" - exit 1 -fi -echo "SDC_PASSWD=$SDC_PASSWD" - # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..5}; do diff --git a/docker/instance_config.sh b/docker/instance_config.sh index 824216c6..04ec38e6 100755 --- a/docker/instance_config.sh +++ b/docker/instance_config.sh @@ -23,7 +23,4 @@ sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/conf sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/nfvo/catalog/catalog/pub/config/config.py sed -i "s|REDIS_HOST.*|REDIS_HOST = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py -sed -i "s|SDC_USER.*|SDC_USER = '$SDC_USER'|" vfc/nfvo/catalog/catalog/pub/config/config.py -sed -i "s|SDC_PASSWD.*|SDC_PASSWD = $SDC_PASSWD|" vfc/nfvo/catalog/catalog/pub/config/config.py - cat vfc/nfvo/catalog/catalog/pub/config/config.py -- 2.16.6