diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-24 22:35:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 22:35:04 -0400 |
| commit | d21c0b0deef39496d07da5a077dfc8ddad4cb4c9 (patch) | |
| tree | b1ecbad749e2c8452ed686e321f0522a5351d7e1 | |
| parent | d5ab87f37387f5b3f2d1fe0c8909c0d21afb5b34 (diff) | |
| parent | 3639424e20b73b30b49438ee9ec3fbc461bb72de (diff) | |
| download | openshift-d21c0b0deef39496d07da5a077dfc8ddad4cb4c9.tar.gz openshift-d21c0b0deef39496d07da5a077dfc8ddad4cb4c9.tar.bz2 openshift-d21c0b0deef39496d07da5a077dfc8ddad4cb4c9.tar.xz openshift-d21c0b0deef39496d07da5a077dfc8ddad4cb4c9.zip | |
Merge pull request #2082 from abutcher/upgrade-docker
Don't upgrade docker on non-containerized etcd.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index 6aff518ce..f163cca86 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -212,6 +212,9 @@ msg: Upgrade packages not found when: openshift_image_tag is not defined and (g_aos_versions.avail_version | default(g_aos_versions.curr_version, true) | version_compare(target_version, '<')) +- name: Verify docker upgrade targets + hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config + tasks: - name: Determine available Docker script: ../files/rpm_versions.sh docker register: g_docker_version_result diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index c93bf2a17..964257af5 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -4,7 +4,7 @@ ############################################################################### - name: Upgrade docker - hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config + hosts: oo_masters_to_config:oo_nodes_to_config roles: - openshift_facts tasks: @@ -20,6 +20,15 @@ openshift_image_tag: "v{{ g_new_version }}" openshift_version: "{{ g_new_version }}" +- name: Upgrade docker + hosts: oo_etcd_to_config + roles: + - openshift_facts + tasks: + # Upgrade docker when host is not atomic and host is not a non-containerized etcd node + - include: docker_upgrade.yml + when: not openshift.common.is_atomic | bool and not ('oo_etcd_to_config' in group_names and not openshift.common.is_containerized) + # The cli image is used by openshift_docker_facts to determine the currently installed # version. We need to explicitly pull the latest image to handle cases where # the locally cached 'latest' tag is older the g_new_version. |