diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-11 14:07:22 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-11 14:07:22 -0500 |
| commit | ceda01624180edfded7f984468f87049665d376f (patch) | |
| tree | e5dd12181d8d47c81c935e4ea854675e93ae9b42 /playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml | |
| parent | cfb19e24b7b93fd3b73201358d3f3ceb67840a05 (diff) | |
| parent | 4385281079a6023625720c06fb93d6d76d0092be (diff) | |
| download | openshift-ceda01624180edfded7f984468f87049665d376f.tar.gz openshift-ceda01624180edfded7f984468f87049665d376f.tar.bz2 openshift-ceda01624180edfded7f984468f87049665d376f.tar.xz openshift-ceda01624180edfded7f984468f87049665d376f.zip | |
Merge pull request #1377 from brenton/bz1302970
Bug 1302970 - update script does not patch router if name is differen…
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml index d8336fcae..d7a2ac405 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml @@ -20,13 +20,27 @@ - role: openshift_examples openshift_examples_import_command: replace pre_tasks: - - name: Check for default router + - name: Collect all routers command: > - {{ oc_cmd }} get -n default dc/router - register: _default_router + {{ oc_cmd }} get pods --all-namespaces -l 'router' -o json + register: all_routers failed_when: false changed_when: false + - set_fact: haproxy_routers="{{ (all_routers.stdout | from_json)['items'] | oo_pods_match_component(openshift_deployment_type, 'haproxy-router') | oo_select_keys_from_list(['metadata']) }}" + when: all_routers.rc == 0 + + - set_fact: haproxy_routers=[] + when: all_routers.rc != 0 + + - name: Update router image to current version + when: all_routers.rc == 0 + command: > + {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -p + '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}"}]}}}}' + --api-version=v1 + with_items: haproxy_routers + - name: Check for default registry command: > {{ oc_cmd }} get -n default dc/docker-registry @@ -34,13 +48,6 @@ failed_when: false changed_when: false - - name: Update router image to current version - when: _default_router.rc == 0 - command: > - {{ oc_cmd }} patch dc/router -p - '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}"}]}}}}' - --api-version=v1 - - name: Update registry image to current version when: _default_registry.rc == 0 command: > |