X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Finstance_config.sh;h=9257c9ff6896c27972aa4063020567d6339c3966;hb=52ed97c6d08bd8a1a66abe1e5f91ded4a9d6dc03;hp=d3501b45fe4401263b1dad0418e7bb32cc965d13;hpb=452c2b042e394d6634d8e457c338607d4f92a09c;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/instance_config.sh b/lcm/docker/instance_config.sh
index d3501b45..9257c9ff 100755
--- a/lcm/docker/instance_config.sh
+++ b/lcm/docker/instance_config.sh
@@ -3,27 +3,33 @@
 MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
 MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
 
-sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" lcm/lcm/pub/config/config.py
-sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" lcm/lcm/pub/config/config.py
-sed -i "s|DB_NAME.*|DB_NAME = 'gvnfm'|" lcm/lcm/pub/config/config.py
-sed -i "s|DB_USER.*|DB_USER = 'gvnfm'|" lcm/lcm/pub/config/config.py
-sed -i "s|DB_PASSWD.*|DB_PASSWD = 'gvnfm'|" lcm/lcm/pub/config/config.py
-sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" lcm/lcm/pub/config/config.py
+if [ $MSB_IP ]; then
+    sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+fi
+
+if [ $MSB_PORT ]; then
+    sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+fi
+
+if [ $SERVICE_IP ]; then
+    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+fi
+
+sed -i "s/127.0.0.1:80/$MSB_IP:$MSB_PORT/" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
 
 # Configure MYSQL
-if [ -z "$MYSQL_ADDR" ]; then
-    export MYSQL_IP=`hostname -i`
-    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'|" lcm/lcm/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" lcm/lcm/pub/config/config.py
 
-cat lcm/lcm/pub/config/config.py
+sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
 
-sed -i "s|127\.0\.0\.1|$SERVICE_IP|" lcm/run.sh
-sed -i "s|127\.0\.0\.1|$SERVICE_IP|" lcm/stop.sh
+cat vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py