diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-06 10:42:12 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-12 14:12:42 -0400 |
| commit | 477f04a7a9846579d2bc86d9c260d9849f593961 (patch) | |
| tree | 12f5d52295ae92f74843e1a2be83638505563e01 /playbooks/common/openshift-cluster | |
| parent | e284ee1c2dba7f6ceeedf8af4adc60a795721166 (diff) | |
| download | openshift-477f04a7a9846579d2bc86d9c260d9849f593961.tar.gz openshift-477f04a7a9846579d2bc86d9c260d9849f593961.tar.bz2 openshift-477f04a7a9846579d2bc86d9c260d9849f593961.tar.xz openshift-477f04a7a9846579d2bc86d9c260d9849f593961.zip | |
Containerized installs on RHEL were downgrading docker unnecessarily
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 26 |
2 files changed, 19 insertions, 17 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 6e6f31195..47f22c4e8 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 @@ -57,6 +57,11 @@ roles: - openshift_facts tasks: + - openshift_facts: + role: master + local_facts: + ha: "{{ groups.oo_masters_to_config | length > 1 }}" + - name: Ensure Master is running service: name: "{{ openshift.common.service_type }}-master" @@ -77,11 +82,6 @@ state: started enabled: yes when: openshift.master.ha is defined and openshift.master.ha | bool and openshift.common.is_containerized | bool - post_tasks: - - openshift_facts: - role: master - local_facts: - ha: "{{ groups.oo_masters_to_config | length > 1 }}" - name: Verify upgrade can proceed hosts: oo_nodes_to_config 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 041ad5a9a..212cdab66 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 @@ -1,5 +1,19 @@ --- +############################################################################### +# The restart playbook should be run after this playbook completes. +############################################################################### + +- name: Upgrade docker + hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config + roles: + - openshift_facts + tasks: + - include: docker_upgrade.yml + when: not openshift.common.is_atomic | bool + # This is a workaround for authenticated registries +# This has to happen after the docker upgrade due to a bug in docker 1.8.2's +# --add-registry implementation - name: Download new images hosts: oo_nodes_to_config roles: @@ -29,18 +43,6 @@ - "{{ openshift.master.master_image }}" ############################################################################### -# The restart playbook should be run after this playbook completes. -############################################################################### - -- name: Upgrade docker - hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config - roles: - - openshift_facts - tasks: - - include: docker_upgrade.yml - when: not openshift.common.is_atomic | bool - -############################################################################### # Upgrade Masters ############################################################################### - name: Upgrade master |