summaryrefslogtreecommitdiffstats
path: root/nokia
diff options
context:
space:
mode:
authoryufei_zhou <yufei.zhou@nokia-sbell.com>2017-10-26 10:37:32 +0800
committeryufei_zhou <yufei.zhou@nokia-sbell.com>2017-10-26 10:37:32 +0800
commit1560591b52620f215f9a1d3eb5de07f23b16e586 (patch)
treef94e26510cac8ecc814a7781ea886275c56332bf /nokia
parent52461b7bd6ab138dcf2ad74c65a4ae60fc68b48a (diff)
start mysql /usr/bin/mysqld_safe &
Change-Id: I468031c7011389727dad6dfa544e69594a213ba7 Issue-ID: VFC-544 Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
Diffstat (limited to 'nokia')
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile1
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh8
4 files changed, 2 insertions, 11 deletions
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 017c8944..419b4569 100644
--- 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 1c6ef968..05d261a9 100755
--- 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 ee6cb2d4..b70d8289 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-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
index 745e97e1..3c1ec6ca 100755
--- 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