Fix the wait_for modules

After restart the service, service's port should be polled rather than haproxy.

JIRA: COMPASS-491

Change-Id: I52165e9673b997883109fbf93a93b360a25dabba
Signed-off-by: liyuenan <liyuenan@huawei.com>

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
index 7a507c8..95dd2e8 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
@@ -142,7 +142,7 @@
 
 #############################################
 - name: wait for keystone ready
-  wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }}
+  wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }}
 
 #- name: cron job to purge expired tokens hourly
 #  cron:

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml
index 2c61ff6..f68105f 100644 (file)
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml
@@ -19,7 +19,7 @@
   service: name=neutron-server state=restarted enabled=yes
 
 - name: wait for neutron ready
-  wait_for: port=9696 delay=10 timeout=30 host={{ internal_vip.ip }}
+  wait_for: port=9696 delay=10 timeout=60 host={{ internal_ip }}
 
 - name: create external net
   shell:

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_config.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_config.yml
index 35c84ce..3fea6e2 100644 (file)
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_config.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_config.yml
@@ -92,7 +92,7 @@
 - meta: flush_handlers
 
 - name: wait for keystone ready
-  wait_for: port=35357 delay=3 timeout=30 host={{ internal_vip.ip }}
+  wait_for: port=35357 delay=10 timeout=60 host={{ internal_ip }}
 
 - name: cron job to purge expired tokens hourly
   cron:

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/tasks/moon-controller.yml
index 7a507c8..95dd2e8 100644 (file)
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/tasks/moon-controller.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/tasks/moon-controller.yml
@@ -142,7 +142,7 @@
 
 #############################################
 - name: wait for keystone ready
-  wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }}
+  wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }}
 
 #- name: cron job to purge expired tokens hourly
 #  cron:

diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml
index 574ebab..e7e9297 100644 (file)
--- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml
+++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml
@@ -12,7 +12,7 @@
   shell: su -s /bin/sh -c 'keystone-manage db_sync' keystone
 
 - name: wait for keystone ready
-  wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }}
+  wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }}
 
 - name: cron job to purge expired tokens hourly
   cron: