start mysql /usr/bin/mysqld_safe &

Change-Id: I468031c7011389727dad6dfa544e69594a213ba7
Issue-ID: VFC-544
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>

diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
index 017c894..419b456 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
+++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
@@ -1,5 +1,5 @@
 {
-  "serviceName": "nokia-vnfm-driver",
+  "serviceName": "nokiavnfmdriver",
   "version": "v1",
   "url": "/api/nokiavnfmdriver/v1",
   "protocol": "REST",

diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
index 1c6ef96..05d261a 100755 (executable)
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
@@ -21,7 +21,6 @@ WORKDIR /service
 # 20-mysq.txt
 
 # Set up mysql
-RUN yum install initscripts
 RUN wget -q http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm && rpm -ivh mysql-community-release-el7-5.noarch.rpm && rm -f mysql-community-release-el7-5.noarch.rpm
 RUN yum -y update
 RUN yum -y install -y mysql-server

diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh
index ee6cb2d..b70d828 100755 (executable)
--- 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-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
index 745e97e..3c1ec6c 100755 (executable)
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
@@ -16,14 +16,6 @@
 #
 # Config mysql credentials
 
-function start_mysql {
-    echo "start mysql ... "
-    su /sbin/service mysql restart
-    sleep 1
-}
-
-start_mysql
-
 # Initialize MySQL schema
 cd bin
 ./init_db.sh root rootpass 127.0.0.1 3306