From d3410fb5cc77b7d58b8d27351345fba09f968019 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Fri, 20 Oct 2017 10:23:17 +0800 Subject: [PATCH] update instance-init.sh Change-Id: Ida7423127ee2e6e00e57abf5268a1a8e37b183db Issue-ID: VFC-544 Signed-off-by: yufei_zhou --- nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh | 11 ++++++++++- nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh index 94f8d5bc..1631cc59 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh @@ -16,7 +16,16 @@ # # Config MSB address MSB_IP=`echo $MSB_ADDR | cut -d: -f 1` -sed -i "s|127\.0\.0\.1|${MSB_IP}|" etc/conf/restclient.json +MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2` + +if [ $MSB_PORT ]; then + sed -i "s|127\.0\.0\.1|${MSB_IP}|" etc/conf/restclient.json +fi + +if [ $MSB_PORT ]; then + sed -i "s|80|${$MSB_PORT}|" etc/conf/restclient.json +fi + cat etc/conf/restclient.json # Set self IP diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh index 69e2b25d..39f0c3e9 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh @@ -18,7 +18,7 @@ function start_mysql { echo "start mysql ... " - service mysql start + /usr/bin/systemctl start mysql.service || /usr/sbin/service mysql start sleep 1 } -- 2.16.6