X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Finstance_config.sh;h=524d4e7f2976ecb960bb8f96be444de06451cdf5;hb=c1e3d72d21dc250e81a21e714a86245495d26006;hp=1fc5edaace6c84c0e2e71d59a35be34bc4ac4caf;hpb=b18660b3019f22ec49e5e9fde701e9b8d8a0691a;p=vfc%2Fnfvo%2Flcm.git

diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index 1fc5edaa..524d4e7f 100755
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -3,43 +3,42 @@
 MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
 MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
 
+MR_IP=`echo $MR_ADDR | cut -d: -f 1`
+MR_PORT=`echo $MR_ADDR | cut -d: -f 2`
+
 if [ $MSB_IP ]; then
-    sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+    sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi
 
 if [ $MSB_PORT ]; then
-    sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+    sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi
 
-if [ $SERVICE_IP ]; then
-    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/lcm/lcm/pub/config/config.py
-    sed -i "s|127\.0\.0\.1|$SERVICE_IP|" vfc/nfvo/lcm/run.sh
-    sed -i "s|127\.0\.0\.1|$SERVICE_IP|" vfc/nfvo/lcm/stop.sh
+if [ $MR_IP ]; then
+    sed -i "s|MR_IP.*|MR_IP = '$MR_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi
 
-if [ $REDIS_HOST ]; then
-    sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_HOST'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+if [ $MR_PORT ]; then
+    sed -i "s|MR_PORT.*|MR_PORT = '$MR_PORT'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi
 
-if [ $SDC_BASE_URL ]; then
-    sed -i "s|SDC_BASE_URL.*|SDC_BASE_URL = '$SDC_BASE_URL'|" vfc/nfvo/lcm/lcm/pub/config/config.py
+if [ $SERVICE_IP ]; then
+    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/lcm/lcm/pub/config/config.py
 fi
 
-sed -i "s|DB_NAME.*|DB_NAME = 'vfcnfvolcm'|" vfc/nfvo/lcm/lcm/pub/config/config.py
-sed -i "s|DB_USER.*|DB_USER = 'vfcnfvolcm'|" vfc/nfvo/lcm/lcm/pub/config/config.py
-sed -i "s|DB_PASSWD.*|DB_PASSWD = 'vfcnfvolcm'|" vfc/nfvo/lcm/lcm/pub/config/config.py
-
 # Configure MYSQL
-if [ -z "$MYSQL_ADDR" ]; then
-    export MYSQL_IP=127.0.0.1
-    export MYSQL_PORT=3306
-    export MYSQL_ADDR=$MYSQL_IP:$MYSQL_PORT
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
+echo "MYSQL_ADDR=$MYSQL_ADDR"
+
+if [ $REDIS_ADDR ]; then
+    REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
 else
-    MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-    MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
+    REDIS_IP="$MYSQL_ADDR"
 fi
-echo "MYSQL_ADDR=$MYSQL_ADDR"
+
 sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/nfvo/lcm/lcm/pub/config/config.py
+sed -i "s|REDIS_HOST.*|REDIS_HOST = '$MYSQL_IP'|" vfc/nfvo/lcm/lcm/pub/config/config.py
 
 cat vfc/nfvo/lcm/lcm/pub/config/config.py