summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryufei_zhou <yufei.zhou@nokia-sbell.com>2017-10-20 10:23:17 +0800
committeryufei_zhou <yufei.zhou@nokia-sbell.com>2017-10-20 10:23:17 +0800
commitd3410fb5cc77b7d58b8d27351345fba09f968019 (patch)
tree6265942890ba4c8574e11b07585f2c001c2642bf
parent030d5c4ccf2fd507a138e5b3e6145690be9cc455 (diff)
update instance-init.sh
Change-Id: Ida7423127ee2e6e00e57abf5268a1a8e37b183db Issue-ID: VFC-544 Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh11
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh2
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
}