summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-02-01 09:33:11 -0500
committerGitHub <noreply@github.com>2018-02-01 09:33:11 -0500
commit8d2f2d7820b5c238f4723e4eade3882ca7332685 (patch)
tree0adca9f6b7cdb7719109bb0ff938eecc37981e29
parent1a58f7fc7622e3e96dab0b45737203ae89af8e76 (diff)
parent1295e8882895f5cf827d6592cb0fb352793c52c1 (diff)
downloadopenshift-8d2f2d7820b5c238f4723e4eade3882ca7332685.tar.gz
openshift-8d2f2d7820b5c238f4723e4eade3882ca7332685.tar.bz2
openshift-8d2f2d7820b5c238f4723e4eade3882ca7332685.tar.xz
openshift-8d2f2d7820b5c238f4723e4eade3882ca7332685.zip
Merge pull request #6944 from mtnbikenc/fix-1540108
[1540108] Ignore openshift_pkg_version during 3.8 upgrade
-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