From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 18 Sep 2018 13:11:46 +0000 (+0400)
Subject: Make docker isolation chain go first
X-Git-Tag: opnfv-7.0.0~47
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F62449%2F2;p=fuel.git

Make docker isolation chain go first

Restart docker service to refresh FORWARD chain
and insert docker related rules on top.

Change-Id: I971840f5979636c4ea8ae4d66a82982c24aa5f66
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 11218196e..8baacfab0 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -300,12 +300,16 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then
 else
     prepare_vms "${base_image}" "${MCP_STORAGE_DIR}" "${virtual_repos_pkgs}" \
       "${virtual_nodes[@]}"
-    prepare_containers "${MCP_STORAGE_DIR}"
     create_networks "${OPNFV_BRIDGES[@]}"
     do_sysctl_cfg
     do_udev_cfg
     create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
     start_vms "${virtual_nodes[@]}"
+
+    # https://github.com/docker/libnetwork/issues/1743
+    # rm -f /var/lib/docker/network/files/local-kv.db
+    sudo systemctl restart docker
+    prepare_containers "${MCP_STORAGE_DIR}"
 fi
 
 start_containers "${MCP_STORAGE_DIR}"