diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2019-02-21 10:47:55 +0800 |
|---|---|---|
| committer | yangyan <yangyanyj@chinamobile.com> | 2019-02-21 10:48:04 +0800 |
| commit | 719e0d9fa0c9fc1f5d7da336b7618adaf2616d2e (patch) | |
| tree | ad4b10979b0f4e0fa4f9a15207968c23894acb76 | |
| parent | 210c1ecb82a7f449aad19c06472f12222f28bba3 (diff) | |
Update SDC env injection
Issue-ID: VFC-1260
Change-Id: I72e489f3ded66d4f1a1a1b4ac5ced16a986eccfa
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rwxr-xr-x | docker/docker-entrypoint.sh | 12 | ||||
| -rwxr-xr-x | docker/instance_config.sh | 3 |
2 files changed, 0 insertions, 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 |