summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-07 15:17:28 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-07 15:17:28 -0300
commit258ea62f3bb1bfc89eb4e676c77d1610aa067c43 (patch)
tree0090d9658fb0bfaf7758f1153ba1360cb2084965 /playbooks/common/openshift-cluster/upgrades
parentdd8501ca8199484531e0a6d2b40139d4085afefa (diff)
downloadopenshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.gz
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.bz2
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.xz
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.zip
Respect image tag/pkg version during upgrade.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml8
1 files changed, 5 insertions, 3 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 f9ca26e34..8596443c0 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
@@ -66,9 +66,11 @@
- include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
vars:
- # Force the openshift_version role to 3.2, it will convert this to a more specific variable and
- # make sure the openshift_image_tag and openshift_pkg_version are all set appropriately.
- openshift_version: "3.2"
+ # Request openshift_release 3.2 and let the openshift_version role handle converting this
+ # to a more specific version, respecting openshift_image_tag and openshift_pkg_version if
+ # defined, and overriding the normal behavior of protecting the installed version
+ openshift_release: "3.2"
+ openshift_protect_installed_version: False
- name: Verify upgrade can proceed on masters
hosts: oo_masters_to_config