From 1295e8882895f5cf827d6592cb0fb352793c52c1 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Tue, 30 Jan 2018 12:00:19 -0500
Subject: 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
---
 .../common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml     | 1 +
 1 file changed, 1 insertion(+)

(limited to 'playbooks')

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
-- 
cgit v1.2.3