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 /roles | |
| 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 'roles')
| -rw-r--r-- | roles/openshift_version/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/first_master.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_version/defaults/main.yml b/roles/openshift_version/defaults/main.yml index e2e6538c9..513dff045 100644 --- a/roles/openshift_version/defaults/main.yml +++ b/roles/openshift_version/defaults/main.yml @@ -10,3 +10,4 @@ openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_typ openshift_use_crio_only: False l_first_master_version_task_file: "{{ openshift_is_containerized | ternary('first_master_containerized_version.yml', 'first_master_rpm_version.yml') }}" +l_force_image_tag_to_version: False diff --git a/roles/openshift_version/tasks/first_master.yml b/roles/openshift_version/tasks/first_master.yml index 374725086..e01a56dc1 100644 --- a/roles/openshift_version/tasks/first_master.yml +++ b/roles/openshift_version/tasks/first_master.yml @@ -24,7 +24,9 @@ - block: - debug: - msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}" + msg: "openshift_image_tag set to v{{ openshift_version }}" - set_fact: openshift_image_tag: v{{ openshift_version }} - when: openshift_image_tag is not defined + when: > + openshift_image_tag is not defined + or l_force_image_tag_to_version | bool |