summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-18 14:49:50 -0500
committerGitHub <noreply@github.com>2017-01-18 14:49:50 -0500
commit18cfe22efe19b92e611dddb3a96a877de92b965a (patch)
tree92d97d97a01232ccc6f5db93475683b78a66ff7f
parentf0eafcb824a7f6f538485f6a9a58103b91f55aab (diff)
parente2f8543fa8dd405ba144d04ce4df27c876a615ae (diff)
downloadopenshift-18cfe22efe19b92e611dddb3a96a877de92b965a.tar.gz
openshift-18cfe22efe19b92e611dddb3a96a877de92b965a.tar.bz2
openshift-18cfe22efe19b92e611dddb3a96a877de92b965a.tar.xz
openshift-18cfe22efe19b92e611dddb3a96a877de92b965a.zip
Merge pull request #3114 from dgoodwin/wait-for-restart
More reliable wait for master after full host reboot.
-rw-r--r--playbooks/common/openshift-master/restart_hosts.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml
index ffa23d26a..832301e3d 100644
--- a/playbooks/common/openshift-master/restart_hosts.yml
+++ b/playbooks/common/openshift-master/restart_hosts.yml
@@ -7,12 +7,19 @@
ignore_errors: true
become: yes
-# Ensure the api_port is available.
-- name: Wait for master API to come back online
- become: no
+- name: Wait for master to restart
local_action:
module: wait_for
- host="{{ openshift.common.hostname }}"
+ host="{{ inventory_hostname }}"
state=started
delay=10
- port="{{ openshift.master.api_port }}"
+ become: no
+
+# Now that ssh is back up we can wait for API on the remote system,
+# avoiding some potential connection issues from local system:
+- name: Wait for master API to come back online
+ wait_for:
+ host: "{{ openshift.common.hostname }}"
+ state: started
+ delay: 10
+ port: "{{ openshift.master.api_port }}"