diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-27 11:15:40 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-27 11:15:40 -0300 |
| commit | 08f1caed84d46d0263f0c1aaaf2da891946b1a96 (patch) | |
| tree | 836ef5dc147dc4399bead23fa82d4855f87de06f /playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2 | |
| parent | 9a5bd6ab7b46228b62f8d8d29dd1f0574c3ec3fa (diff) | |
| download | openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.gz openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.bz2 openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.xz openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.zip | |
Only nuke images when crossing the Docker 1.10 boundary in upgrade.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 2 |
2 files changed, 5 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 55ede13f0..e78418c6c 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 @@ -89,6 +89,10 @@ # defined, and overriding the normal behavior of protecting the installed version openshift_release: "3.2" openshift_protect_installed_version: False + # Docker role (a dependency) should be told not to do anything to installed version + # of docker, we handle this separately during upgrade. (the inventory may have a + # docker_version defined, we don't want to actually do it until later) + docker_protect_installed_version: True - name: Verify master processes hosts: oo_masters_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 f2e408ad4..bea1eb4e1 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 @@ -86,7 +86,7 @@ when: docker_upgrade is not defined or docker_upgrade | bool - include: ../docker/upgrade.yml - when: docker_upgrade is defined and docker_upgrade | bool + when: docker_upgrade | bool - include: rpm_upgrade.yml vars: |