Bug 1541946- waiting for master reboot now works behind bastion

playbooks/openshift-master/private/tasks/restart_hosts.yml

@@ -7,26 +7,10 @@
   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="{{ wait_for_host }}"
-      state=started
-      delay=10
-      timeout=600
-      port="{{ ansible_port | default(ansible_ssh_port | default(22,boolean=True),boolean=True) }}"
+  wait_for_connection:
+    delay: 10
+    timeout: 600
 
 # Now that ssh is back up we can wait for API on the remote system,
 # avoiding some potential connection issues from local system: