From: wutianwei <wutianwei1@huawei.com>
Date: Fri, 7 Jul 2017 04:09:27 +0000 (+0800)
Subject: Fix bug the controller node when baremetal deploy
X-Git-Tag: opnfv-5.0.0~60^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F37047%2F3;p=compass4nfv.git

Fix bug the controller node when baremetal deploy

We need to flush the handle to restart network,
before checking network.

improve the message when failed

Change-Id: If38198c62b4bf81d38b294264db30514998fe086
Signed-off-by: wutianwei <wutianwei1@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml
index c878ab7f..e3b467cf 100644
--- a/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml
+++ b/deploy/adapters/ansible/roles/config-controller/tasks/Ubuntu.yml
@@ -14,6 +14,8 @@
   notify:
     - restart network service
 
+- meta: flush_handlers
+
 - name: check apt source
   shell: "ping -c 2 {{LOCAL_REPOSITORY_IP}} > /dev/null"
   register: checkresult
diff --git a/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml b/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml
index 5b70aeef..478c4d48 100644
--- a/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-infrastructure/tasks/main.yml
@@ -19,8 +19,9 @@
   register: setup_infrastructure_result
 
 - fail:
-    msg: "there are some task failed when setup host."
-  when: setup_infrastructure_result.stdout.find('failed=1') != -1
+    msg: "there are some task failed when setup infrastructure."
+  when: setup_infrastructure_result.stdout.find('failed={{item}}') != -1
+  with_sequence: start=1 end={{ max_failed_times }} stride=1
 
 - fail:
     msg: "some host are unreachable."
diff --git a/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml b/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml
new file mode 100644
index 00000000..22a990ef
--- /dev/null
+++ b/deploy/adapters/ansible/roles/setup-infrastructure/vars/main.yml
@@ -0,0 +1,2 @@
+---
+max_failed_times: 9
diff --git a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml
index e5770245..b71612f7 100644
--- a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml
@@ -19,7 +19,7 @@
   register: setup_openstack_result
 
 - fail:
-    msg: "some task failed when setup host."
+    msg: "some task failed when setup openstack."
   when: setup_openstack_result.stdout.find('failed=1') != -1
 
 - fail: