diff options
author | Michael Gugino <mgugino@redhat.com> | 2018-02-12 17:46:24 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2018-02-13 16:32:36 -0500 |
commit | cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa (patch) | |
tree | 272b8d3867998590b690af95d56297fbc2a2e348 /roles/openshift_version/tasks/first_master_rpm_version.yml | |
parent | 864d3bd62d28ea2ac10eaef4b767ce3fc7189bba (diff) | |
download | openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.gz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.bz2 openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.xz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.zip |
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
Diffstat (limited to 'roles/openshift_version/tasks/first_master_rpm_version.yml')
-rw-r--r-- | roles/openshift_version/tasks/first_master_rpm_version.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/first_master_rpm_version.yml b/roles/openshift_version/tasks/first_master_rpm_version.yml index 264baca65..9a5f0c568 100644 --- a/roles/openshift_version/tasks/first_master_rpm_version.yml +++ b/roles/openshift_version/tasks/first_master_rpm_version.yml @@ -11,6 +11,8 @@ - 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 + when: openshift_version is not defined or l_double_upgrade_cp_reset_version |