diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/docker')
3 files changed, 4 insertions, 11 deletions
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 |