summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-26 12:21:37 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-26 13:00:57 -0500
commitbb111d7059c948ef305564fd6ac78f53a7ec46ce (patch)
tree1a24d141172870b474df76aefdbb1b163798078d /roles
parentc6423636a4d14139960f4677dbab8fa646d1cb0c (diff)
downloadopenshift-bb111d7059c948ef305564fd6ac78f53a7ec46ce.tar.gz
openshift-bb111d7059c948ef305564fd6ac78f53a7ec46ce.tar.bz2
openshift-bb111d7059c948ef305564fd6ac78f53a7ec46ce.tar.xz
openshift-bb111d7059c948ef305564fd6ac78f53a7ec46ce.zip
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.yml1
-rw-r--r--roles/openshift_version/tasks/first_master.yml6
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