diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-09-05 06:26:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-05 06:26:28 +0000 |
| commit | 14fbef4e203326c7e7d552f6d89f0dbd592e87ba (patch) | |
| tree | 3edfe253fd0cd86ed4caa0129f48135c989dc83d /docker | |
| parent | 446482e2f5281155600cd4ea2b6dd50b1d3ae2df (diff) | |
| parent | 880272dbf48594791a2d93e74f0ffab896c49cdd (diff) | |
Merge "Fix docker ENTRYPOINT script"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/docker-entrypoint.sh | 2 | ||||
| -rwxr-xr-x | docker/instance_config.sh | 2 | ||||
| -rwxr-xr-x | docker/instance_init.sh | 10 |
3 files changed, 5 insertions, 9 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 16738ac6..3a309f7d 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -18,7 +18,7 @@ echo "MSB_ADDR=$MSB_ADDR" # Wait for MSB initialization echo "Wait for MSB initialization" -for i in {1..20}; do +for i in {1..5}; do curl -sS -m 1 $MSB_ADDR > /dev/null && break sleep $i done diff --git a/docker/instance_config.sh b/docker/instance_config.sh index 1fc5edaa..06e0d027 100755 --- a/docker/instance_config.sh +++ b/docker/instance_config.sh @@ -31,7 +31,7 @@ sed -i "s|DB_PASSWD.*|DB_PASSWD = 'vfcnfvolcm'|" vfc/nfvo/lcm/lcm/pub/config/con # Configure MYSQL if [ -z "$MYSQL_ADDR" ]; then - export MYSQL_IP=127.0.0.1 + export MYSQL_IP=`hostname -i` export MYSQL_PORT=3306 export MYSQL_ADDR=$MYSQL_IP:$MYSQL_PORT else diff --git a/docker/instance_init.sh b/docker/instance_init.sh index f758a71b..f5a50547 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -10,13 +10,9 @@ function start_redis_server { } function start_mysql { - su mysql -c /usr/bin/mysqld_safe & - service mysql start - # Wait for mysql to initialize; Set mysql root password - for i in {1..10}; do - sleep $i - bash /usr/bin/mysqladmin -u root password $MYSQL_ROOT_PASSWORD &> /dev/null && break - done + sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf + service mysql restart + sleep 1 } function create_database { |