From adccff862e8e5d56673415c3ee8d133997d80211 Mon Sep 17 00:00:00 2001
From: Eric Wolinetz <ewolinet@redhat.com>
Date: Mon, 25 Sep 2017 16:38:21 -0500
Subject: Updating to check for netnamespace kube-service-catalog to be ready

---
 roles/openshift_service_catalog/tasks/install.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'roles')

diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml
index faf1aea97..e202ae173 100644
--- a/roles/openshift_service_catalog/tasks/install.yml
+++ b/roles/openshift_service_catalog/tasks/install.yml
@@ -23,10 +23,22 @@
     name: "kube-service-catalog"
     node_selector: ""
 
-- name: Make kube-service-catalog project network global
-  command: >
-    oc adm pod-network make-projects-global kube-service-catalog
-  when: os_sdn_network_plugin_name == 'redhat/openshift-ovs-multitenant'
+- when: os_sdn_network_plugin_name == 'redhat/openshift-ovs-multitenant'
+  block:
+    - name: Waiting for netnamespace kube-service-catalog to be ready
+      oc_obj:
+        kind: netnamespace
+        name: kube-service-catalog
+        state: list
+      register: get_output
+      until: not get_output.results.stderr is defined
+      retries: 30
+      delay: 1
+      changed_when: false
+
+    - name: Make kube-service-catalog project network global
+      command: >
+        oc adm pod-network make-projects-global kube-service-catalog
 
 - include: generate_certs.yml
 
-- 
cgit v1.2.3