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.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.yml')
-rw-r--r-- | roles/openshift_version/tasks/first_master.yml | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/roles/openshift_version/tasks/first_master.yml b/roles/openshift_version/tasks/first_master.yml index 374725086..022ac30fc 100644 --- a/roles/openshift_version/tasks/first_master.yml +++ b/roles/openshift_version/tasks/first_master.yml @@ -13,18 +13,30 @@ - include_tasks: "{{ l_first_master_version_task_file }}" +# When double upgrade is in process, we want to set everything to match +# openshift_verison. - block: - debug: msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}" - set_fact: - openshift_pkg_version: -{{ openshift_version }} + openshift_pkg_version: "-{{ openshift_version }}" when: - - openshift_pkg_version is not defined - - openshift_upgrade_target is not defined + - openshift_pkg_version is not defined or l_double_upgrade_cp_reset_version +# When double upgrade is in process, we want to set everything to match +# openshift_verison. - block: - debug: msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}" - set_fact: - openshift_image_tag: v{{ openshift_version }} - when: openshift_image_tag is not defined + openshift_image_tag: "v{{ openshift_version }}" + when: openshift_image_tag is not defined or l_double_upgrade_cp_reset_version + +# The end result of these three variables is quite important so make sure they are displayed and logged: +- debug: var=openshift_release + +- debug: var=openshift_image_tag + +- debug: var=openshift_pkg_version + +- debug: var=openshift_version |