summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-13 11:07:31 -0500
committerGitHub <noreply@github.com>2017-02-13 11:07:31 -0500
commit40c5685aad80df4ee1ac318ed9b9f738d12ff999 (patch)
tree7de12966a67443af8822a05bfad118e3fe885a59
parentb47cb60817bfea53cfead10632341f2fdfcad6eb (diff)
parent781d2a1dc87bdc37f02ea6f1a3e83abb666f9c49 (diff)
downloadopenshift-40c5685aad80df4ee1ac318ed9b9f738d12ff999.tar.gz
openshift-40c5685aad80df4ee1ac318ed9b9f738d12ff999.tar.bz2
openshift-40c5685aad80df4ee1ac318ed9b9f738d12ff999.tar.xz
openshift-40c5685aad80df4ee1ac318ed9b9f738d12ff999.zip
Merge pull request #3333 from dgoodwin/restart-hosts-fix
More fixes for reboot/wait for hosts.
-rw-r--r--playbooks/common/openshift-master/restart_hosts.yml16
1 files changed, 14 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml
index a9750e40f..67ba0aa2e 100644
--- a/playbooks/common/openshift-master/restart_hosts.yml
+++ b/playbooks/common/openshift-master/restart_hosts.yml
@@ -7,14 +7,26 @@
ignore_errors: true
become: yes
+# WARNING: This process is riddled with weird behavior.
+
+# Workaround for https://github.com/ansible/ansible/issues/21269
+- set_fact:
+ wait_for_host: "{{ ansible_host }}"
+
+# Ansible's blog documents this *without* the port, which appears to now
+# just wait until the timeout value and then proceed without checking anything.
+# port is now required.
+#
+# However neither ansible_ssh_port or ansible_port are reliably defined, likely
+# only if overridden. Assume a default of 22.
- name: Wait for master to restart
local_action:
module: wait_for
- host="{{ ansible_host }}"
+ host="{{ wait_for_host }}"
state=started
delay=10
timeout=600
- port="{{ ansible_ssh_port }}"
+ port="{{ ansible_port | default(ansible_ssh_port | default(22,boolean=True),boolean=True) }}"
become: no
# Now that ssh is back up we can wait for API on the remote system,