diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 14:34:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 14:34:26 -0700 |
| commit | 350d40f23efc825a62f3d414048dfd6b71a222d4 (patch) | |
| tree | d3823a286b2c5df5fb697f49e261fbcf09eb7c84 | |
| parent | 948649027d3f3ad7a3186208e8e8e057ac550c7e (diff) | |
| parent | adccff862e8e5d56673415c3ee8d133997d80211 (diff) | |
| download | openshift-350d40f23efc825a62f3d414048dfd6b71a222d4.tar.gz openshift-350d40f23efc825a62f3d414048dfd6b71a222d4.tar.bz2 openshift-350d40f23efc825a62f3d414048dfd6b71a222d4.tar.xz openshift-350d40f23efc825a62f3d414048dfd6b71a222d4.zip | |
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
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 20 |
1 files changed, 16 insertions, 4 deletions
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 |