X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Finstance_config.sh;h=7fcaa7a5c927d23971d665281b1e86d89b1a60e6;hb=25a5b7ae680a120672faae4c2a1381b9e89f2a14;hp=a03c41ad97fd897888cd485f6893af0fa1e0ad63;hpb=affcd0828f0dd0941ba546aca5bce05e8ee1a598;p=modeling%2Fetsicatalog.git

diff --git a/docker/instance_config.sh b/docker/instance_config.sh
old mode 100644
new mode 100755
index a03c41a..7fcaa7a
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -1,42 +1,44 @@
 #!/bin/bash
 
+MSB_PROTO=`echo $MSB_PROTO`
 MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
 MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-# modeling/genericparser
+# modeling/etsicatalog
+
+if [ $MSB_PROTO ]; then
+    sed -i "s|MSB_SERVICE_PROTOCOL = .*|MSB_SERVICE_PROTOCOL = '$MSB_PROTO'|" modeling/etsicatalog/catalog/pub/config/config.py
+fi
 
 if [ $MSB_IP ]; then
-#    sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-    sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|"  modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|MSB_SERVICE_IP = .*|MSB_SERVICE_IP = '$MSB_IP'|"  modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 if [ $MSB_PORT ]; then
-#    sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-    sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|MSB_SERVICE_PORT = .*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 if [ $SERVICE_IP ]; then
-#    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/etsicatalog/catalog/pub/config/config.py
+fi
+
+
+if [ $SSL_ENABLED ]; then
+    sed -i "s|SSL_ENABLED.*|SSL_ENABLED = '$SSL_ENABLED'|"  modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 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
-    REDIS_IP="$MYSQL_ADDR"
-fi
+# if [ $REDIS_ADDR ]; then
+#     REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1`
+# else
+#     REDIS_IP="$MYSQL_ADDR"
+# fi
 
-#sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-#sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-#sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|" vfc/nfvo/genericparser/genericparser/pub/config/config.py
-#
-#cat vfc/nfvo/genericparser/genericparser/pub/config/config.py
 
-sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" modeling/genericparser/genericparser/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" modeling/genericparser/genericparser/pub/config/config.py
-sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|"modeling/genericparser/genericparser/pub/config/config.py
+sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" modeling/etsicatalog/catalog/pub/config/config.py
+sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" modeling/etsicatalog/catalog/pub/config/config.py
+# sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|"modeling/etsicatalog/catalog/pub/config/config.py
 
-cat modeling/genericparser/genericparser/pub/config/config.py
+cat modeling/etsicatalog/catalog/pub/config/config.py