Merge pull request #6557 from mgugino-upstream-stage/delay-hosted-wait

Automatic merge from submit-queue.

Move wait_for_pods to it's own play openshift_hosted

Currently, both registry and router pods need to
be polled for successful deployment.

Somtimes this can take up to a minute.

This commit attempts to deploy both pods
before polling either.  This should reduce
the average wait time for polling pods by 50%
as time spent polling the first will also allow
the second pod to continue it's own deployment.

1 files changed, 26 insertions, 0 deletions

diff --git a/playbooks/openshift-hosted/private/openshift_hosted_wait_for_pods.yml b/playbooks/openshift-hosted/private/openshift_hosted_wait_for_pods.yml
new file mode 100644
index 000000000..204cb1781
--- /dev/null
+++ b/playbooks/openshift-hosted/private/openshift_hosted_wait_for_pods.yml
@@ -0,0 +1,26 @@
+---
+# This playbook waits for registry and router pods after both have been
+# created.  It is intended to allow the tasks of deploying both to complete
+# before polling to save time.
+- name: Poll for hosted pod deployments
+  hosts: oo_first_master
+  tasks:
+  - include_role:
+      name: openshift_hosted
+      tasks_from: wait_for_pod.yml
+    vars:
+      l_openshift_hosted_wait_for_pod: "{{ openshift_hosted_router_wait }}"
+      l_openshift_hosted_wfp_items: "{{ openshift_hosted_routers }}"
+    when:
+    - openshift_hosted_manage_router | default(True) | bool
+    - openshift_hosted_router_registryurl is defined
+
+  - include_role:
+      name: openshift_hosted
+      tasks_from: wait_for_pod.yml
+    vars:
+      l_openshift_hosted_wait_for_pod: "{{ openshift_hosted_registry_wait }}"
+      l_openshift_hosted_wfp_items: "{{ r_openshift_hosted_registry_list }}"
+    when:
+    - openshift_hosted_manage_registry | default(True) | bool
+    - openshift_hosted_registry_registryurl is defined