From cc20b0c0b4d57bc2add992e28f7249ae99cf4785 Mon Sep 17 00:00:00 2001 From: yangyan Date: Tue, 2 Apr 2019 17:44:22 +0800 Subject: Fix docker init and config file Change-Id: I75cf8fd885531221d437c71af0f2dad3dc3dd2ba Issue-ID: VFC-1332 Signed-off-by: yangyan --- docker/instance_config.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'docker/instance_config.sh') diff --git a/docker/instance_config.sh b/docker/instance_config.sh index 1739be24..64b69ec9 100755 --- a/docker/instance_config.sh +++ b/docker/instance_config.sh @@ -18,17 +18,15 @@ 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` -REDIS_IP=`echo $REDIS_ADDR | cut -d: -f 1` -REDIS_PORT=`echo $REDIS_ADDR | cut -d: -f 2` +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/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 = '$REDIS_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py -sed -i "s|REDIS_PORT.*|REDIS_PORT = '$REDIS_PORT'|" 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 -- cgit 1.2.3-korg