summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2018-01-30 12:00:19 -0500
committerRussell Teague <rteague@redhat.com>2018-01-30 12:06:18 -0500
commit1295e8882895f5cf827d6592cb0fb352793c52c1 (patch)
tree437a64bff98219ecf2a4aae3f8332a5ffa5c1bc2
parent1dc61697707d43435523a14dda5abe304b198b49 (diff)
downloadopenshift-1295e8882895f5cf827d6592cb0fb352793c52c1.tar.gz
openshift-1295e8882895f5cf827d6592cb0fb352793c52c1.tar.bz2
openshift-1295e8882895f5cf827d6592cb0fb352793c52c1.tar.xz
openshift-1295e8882895f5cf827d6592cb0fb352793c52c1.zip
Ignore openshift_pkg_version during 3.8 upgrade
Version 3.8 is an intermediate step when upgrading to 3.9 and openshift_pkg_version may be set in the inventory for 3.9. This will ensure there is not a conflict between the intermediate step and the final version requested. Bug 1540108 https://bugzilla.redhat.com/show_bug.cgi?id=1540108
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
index fe1fdefff..c8a42322d 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
@@ -64,6 +64,7 @@
- import_playbook: ../upgrade_control_plane.yml
vars:
openshift_release: '3.8'
+ openshift_pkg_version: ''
when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<')
## 3.8 upgrade complete we should now be able to upgrade to 3.9