diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-26 22:21:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 22:21:52 -0800 |
| commit | 6e619ffbe8511689cae5e38ec644fffe01188a0d (patch) | |
| tree | a9887073a6a16aea71659244dd38dc0d6228052a /playbooks | |
| parent | e0a0ad8f7cc6813be492e7368fac6ceac2aef8bf (diff) | |
| parent | bb111d7059c948ef305564fd6ac78f53a7ec46ce (diff) | |
| download | openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.gz openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.bz2 openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.tar.xz openshift-6e619ffbe8511689cae5e38ec644fffe01188a0d.zip | |
Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tag
Automatic merge from submit-queue.
Correct 3.7 to 3.9 upgrade openshift_image_tag
Due to complexities upgrading two versions
at the same time, openshift_image_tag was being
set incorrectly during control_plane upgrades.
This commit ensures that openshift_image_tag
is set correctly during this process.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml | 27 |
1 files changed, 24 insertions, 3 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 4e4ed54fc..fe1fdefff 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 @@ -25,10 +25,18 @@ openshift_upgrade_target: '3.8' openshift_upgrade_min: '3.7' openshift_release: '3.8' - _requested_pkg_version: "{{openshift_pkg_version if openshift_pkg_version is defined else omit }}" - _requested_image_tag: "{{openshift_image_tag if openshift_image_tag is defined else omit }}" + _requested_pkg_version: "{{ openshift_pkg_version if openshift_pkg_version is defined else omit }}" + _requested_image_tag: "{{ openshift_image_tag if openshift_image_tag is defined else omit }}" + l_double_upgrade_cp: True when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<') + - name: set l_force_image_tag_to_version = True + set_fact: + # Need to set this during 3.8 upgrade to ensure image_tag is set correctly + # to match 3.8 version + l_force_image_tag_to_version: True + when: _requested_image_tag is defined + - import_playbook: ../pre/config.yml # These vars a meant to exclude oo_nodes from plays that would otherwise include # them by default. @@ -69,7 +77,20 @@ openshift_upgrade_min: '3.8' openshift_release: '3.9' openshift_pkg_version: "{{ _requested_pkg_version | default ('-3.9*') }}" - openshift_image_tag: "{{ _requested_image_tag | default('v3.9') }}" + # Set the user's specified image_tag for 3.9 upgrade if it was provided. + - set_fact: + openshift_image_tag: "{{ _requested_image_tag }}" + l_force_image_tag_to_version: False + when: _requested_image_tag is defined + # If the user didn't specify an image_tag, we need to force update image_tag + # because it will have already been set during 3.8. If we aren't running + # a double upgrade, then we can preserve image_tag because it will still + # be the user provided value. + - set_fact: + l_force_image_tag_to_version: True + when: + - l_double_upgrade_cp is defined and l_double_upgrade_cp + - _requested_image_tag is not defined - import_playbook: ../pre/config.yml # These vars a meant to exclude oo_nodes from plays that would otherwise include |