Merge pull request #7124 from mgugino-upstream-stage/fix-version-multi

Automatic merge from submit-queue.

Fix version multi

Simplify double upgrade version logic

Currently, double upgrade process (3.7 -> 3.9)
for control plane attempts to run openshift_version
role twice to set the appropriate values for
upgrading each major version, 3.8 and 3.9.

This commit instructs openshift_version to
only inquire about the proper settings for 3.9,
and hard-sets the appropriate values for 3.8.

This allows a simplification of the
openshift_version role, allowing for easier
debugging.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542368

1 files changed, 3 insertions, 6 deletions

diff --git a/roles/openshift_version/tasks/first_master_rpm_version.yml b/roles/openshift_version/tasks/first_master_rpm_version.yml
index 85e440513..9a5f0c568 100644
--- a/roles/openshift_version/tasks/first_master_rpm_version.yml
+++ b/roles/openshift_version/tasks/first_master_rpm_version.yml
@@ -5,17 +5,14 @@
     openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}"
   when:
   - openshift_pkg_version is defined
-  - openshift_pkg_version != ""
   - openshift_version is not defined
-  - not (openshift_version_reinit | default(false))
 
 # These tasks should only be run against masters and nodes
 - name: Set openshift_version for rpm installation
   include_tasks: check_available_rpms.yml
 
+# If double upgrade is in process, we want to set openshift_version to whatever
+# rpm package is available.
 - set_fact:
     openshift_version: "{{ rpm_results.results.versions.available_versions.0 }}"
-  when: openshift_version is not defined or ( openshift_version_reinit | default(false) )
-- set_fact:
-    openshift_pkg_version: "-{{ rpm_results.results.versions.available_versions.0 }}"
-  when: openshift_version_reinit | default(false)
+  when: openshift_version is not defined or l_double_upgrade_cp_reset_version