change the way of create database

[vfc/nfvo/catalog.git] / docker / instance_config.sh

diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index c76770e..13a0a2c 100755 (executable)
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -15,29 +15,16 @@ if [ $SERVICE_IP ]; then
     sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/catalog/catalog/pub/config/config.py
 fi
 
-if [ $REDIS_HOST ]; then
-    sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_HOST'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-fi
-
-if [ $SDC_BASE_URL ]; then
-    sed -i "s|SDC_BASE_URL.*|SDC_BASE_URL = '$SDC_BASE_URL'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-fi
-
-sed -i "s|DB_NAME.*|DB_NAME = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-sed -i "s|DB_USER.*|DB_USER = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py
-sed -i "s|DB_PASSWD.*|DB_PASSWD = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/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
-else
-    MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-    MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
-fi
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
 echo "MYSQL_ADDR=$MYSQL_ADDR"
+MYSQL_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
+MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
+
 sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py
 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|DB_USER.*|DB_USER = '$MYSQL_USER'|" vfc/nfvo/catalog/catalog/pub/config/config.py
+sed -i "s|DB_PASSWD.*|DB_PASSWD = '$MYSQL_ROOT_PASSWORD'|" vfc/nfvo/catalog/catalog/pub/config/config.py
 
 cat vfc/nfvo/catalog/catalog/pub/config/config.py