fix installation bail problem

[demo.git] / boot / dcae2_vm_init.sh

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index f423256..17ab003 100755 (executable)
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -23,11 +23,6 @@
 
 set -ex
 
-# add well-known DCAE hostname aliases
-echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts
-echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts
-
-
 URL_ROOT='nexus.onap.org/service/local/repositories/raw/content'
 REPO_BLUEPRINTS='org.onap.dcaegen2.platform.blueprints'
 REPO_DEPLOYMENTS='org.onap.dcaegen2.deployments'
@@ -52,6 +47,19 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
+# clean up old network configuration in docker engine
+set +e
+if [ -n "$(docker ps -q -a)" ]; then
+  docker stop $(docker ps -q -a)
+  docker update --restart=no $(docker ps -a -q)
+  systemctl restart docker
+  docker rm $(docker ps -q -a)
+  if [ -n "$(docker network ls | grep 'config_default')" ]; then
+    docker network rm config_default
+  fi
+fi
+set -e
+
 
 docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO"