diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-15 18:48:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 18:48:43 -0400 |
commit | dfb68308220f474534ddba49b247f7766afe51de (patch) | |
tree | 47e0cc66c8e7b40d3bb36ec0c00708adac6a5e31 /roles/openshift_hosted/tasks/registry/registry.yml | |
parent | 1ce58b5e0278e2adcab887fed609b3e8d215d44e (diff) | |
parent | acb78312d18c27f607ad71898fcc6bacab4b5cb6 (diff) | |
download | openshift-dfb68308220f474534ddba49b247f7766afe51de.tar.gz openshift-dfb68308220f474534ddba49b247f7766afe51de.tar.bz2 openshift-dfb68308220f474534ddba49b247f7766afe51de.tar.xz openshift-dfb68308220f474534ddba49b247f7766afe51de.zip |
Merge pull request #4402 from stevekuznetsov/skuznets/router-registry-rollout
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_hosted/tasks/registry/registry.yml')
-rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index 751489958..d895e9a68 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -124,6 +124,35 @@ edits: "{{ openshift_hosted_registry_edits }}" force: "{{ True|bool in openshift_hosted_registry_force }}" +- name: Ensure OpenShift registry correctly rolls out (best-effort today) + command: | + oc rollout status deploymentconfig {{ openshift_hosted_registry_name }} \ + --namespace {{ openshift_hosted_registry_namespace }} \ + --config {{ openshift.common.config_base }}/master/admin.kubeconfig + async: 600 + poll: 15 + failed_when: false + +- name: Determine the latest version of the OpenShift registry deployment + command: | + oc get deploymentconfig {{ openshift_hosted_registry_name }} \ + --namespace {{ openshift_hosted_registry_namespace }} \ + --config {{ openshift.common.config_base }}/master/admin.kubeconfig \ + -o jsonpath='{ .status.latestVersion }' + register: openshift_hosted_registry_latest_version + +- name: Sanity-check that the OpenShift registry rolled out correctly + command: | + oc get replicationcontroller {{ openshift_hosted_registry_name }}-{{ openshift_hosted_registry_latest_version.stdout }} \ + --namespace {{ openshift_hosted_registry_namespace }} \ + --config {{ openshift.common.config_base }}/master/admin.kubeconfig \ + -o jsonpath='{ .metadata.annotations.openshift\.io/deployment\.phase }' + register: openshift_hosted_registry_rc_phase + until: "'Running' not in openshift_hosted_registry_rc_phase.stdout" + delay: 15 + retries: 40 + failed_when: "'Failed' in openshift_hosted_registry_rc_phase.stdout" + - include: storage/glusterfs.yml when: - openshift.hosted.registry.storage.kind | default(none) == 'glusterfs' or openshift.hosted.registry.storage.glusterfs.swap |