From ab32ab75c8d721fb1479a3c70fb787b6f224445b Mon Sep 17 00:00:00 2001 From: fujinhua Date: Wed, 8 Aug 2018 16:10:48 +0800 Subject: Remove DB and redis service from vnfmgr Change-Id: I122f239cf4ab59cf5dd65f7fdebd367eebb8b548 Issue-ID: VFC-981 Signed-off-by: fujinhua --- mgr/docker/instance_config.sh | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'mgr/docker/instance_config.sh') diff --git a/mgr/docker/instance_config.sh b/mgr/docker/instance_config.sh index 02e88c6..7952892 100755 --- a/mgr/docker/instance_config.sh +++ b/mgr/docker/instance_config.sh @@ -15,25 +15,13 @@ if [ $SERVICE_IP ]; then sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py fi -if [ $REDIS_HOST ]; then - sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_HOST'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py -fi - -sed -i "s|DB_NAME.*|DB_NAME = 'gvnfm'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py -sed -i "s|DB_USER.*|DB_USER = 'gvnfm'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py -sed -i "s|DB_PASSWD.*|DB_PASSWD = 'gvnfm'|" vfc/gvnfm/vnfmgr/mgr/mgr/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 -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" + sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py +sed -i "s|REDIS_HOST.*|REDIS_HOST = '$MYSQL_IP'|" vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py -cat vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py \ No newline at end of file +cat vfc/gvnfm/vnfmgr/mgr/mgr/pub/config/config.py -- cgit 1.2.3-korg