From: yangyan <yangyanyj@chinamobile.com>
Date: Sat, 2 Feb 2019 03:26:01 +0000 (+0800)
Subject: SDC user and passwd injected via Env
X-Git-Tag: 1.3.0~85
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F77752%2F1;p=vfc%2Fnfvo%2Fcatalog.git

SDC user and passwd injected via Env

Issue-ID: VFC-1260
Change-Id: I090b26a6308874366effc3587689e441ef7155d9
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 0a277fae..2bc14169 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -17,6 +17,18 @@ 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 04ec38e6..824216c6 100755
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -23,4 +23,7 @@ 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