From 64ecb4a77eb5aaf6f17aeb8b04ee0e3847abd82c Mon Sep 17 00:00:00 2001
From: yufei_zhou <yufei.zhou@nokia-sbell.com>
Date: Fri, 20 Oct 2017 23:10:51 +0800
Subject: modify server.xml 8482 as 8486

Change-Id: I7856df6890ec183477bfc21eb077ed9670ea9c76
Issue-ID: VFC-544
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
---
 nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh | 2 +-
 nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh   | 9 +--------
 nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh     | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'nokia/vnfmdriver/vfcadaptorservice/docker')

diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh
index ee6cb2d4..a91b0004 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh
@@ -43,7 +43,7 @@ echo
 ./instance-config.sh
 
 # Start mysql
-su mysql -c /usr/bin/mysqld_safe &
+/usr/bin/mysqld_safe & 
 
 # Perform one-time config
 if [ ! -e init.log ]; then
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
index 1631cc59..8bfc9b35 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
@@ -16,15 +16,8 @@
 #
 # Config MSB address
 MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
-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
+sed -i "s|127\.0\.0\.1|${MSB_IP}|" etc/conf/restclient.json
 
 cat etc/conf/restclient.json
 
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
index 39f0c3e9..7db2ed43 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
@@ -18,8 +18,8 @@
 
 function start_mysql {
     echo "start mysql ... "
-    /usr/bin/systemctl start mysql.service || /usr/sbin/service mysql start
-    sleep 1
+    /usr/bin/mysqld_safe &
+    sleep 5
 }
 
 start_mysql
-- 
cgit 1.2.3-korg