Bläddra i källkod

Merge pull request #5530 from ewolinetz/bz1487959

Automatic merge from submit-queue

Updating to check for netnamespace kube-service-catalog to be ready

When we are using the sdn multitentant plugin we need to wait for the netnamespace to be ready before we can make it a global project
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1487959
OpenShift Merge Robot 7 år sedan
förälder
incheckning
350d40f23e
1 ändrade filer med 16 tillägg och 4 borttagningar
  1. 16 4
      roles/openshift_service_catalog/tasks/install.yml

+ 16 - 4
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