diff options
| author | Russell Teague <rteague@redhat.com> | 2018-02-01 11:15:25 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2018-02-02 10:39:55 -0500 |
| commit | db9c0b33f30e992a9d7d2849d3b9c0ac4904689d (patch) | |
| tree | 068982a247bb8fd8bf7de6b6d39a3fccc88eb3fe /roles | |
| parent | 3e2c7c22a54a3ccf88b49742003a3a4a937683f8 (diff) | |
| download | openshift-db9c0b33f30e992a9d7d2849d3b9c0ac4904689d.tar.gz openshift-db9c0b33f30e992a9d7d2849d3b9c0ac4904689d.tar.bz2 openshift-db9c0b33f30e992a9d7d2849d3b9c0ac4904689d.tar.xz openshift-db9c0b33f30e992a9d7d2849d3b9c0ac4904689d.zip | |
Fix version handling in 3.8/3.9 control plane upgrades
Diffstat (limited to 'roles')
3 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/first_master.yml b/roles/openshift_version/tasks/first_master.yml index e01a56dc1..b0d155c2c 100644 --- a/roles/openshift_version/tasks/first_master.yml +++ b/roles/openshift_version/tasks/first_master.yml @@ -19,7 +19,7 @@ - set_fact: openshift_pkg_version: -{{ openshift_version }} when: - - openshift_pkg_version is not defined + - openshift_pkg_version is not defined or openshift_pkg_version == "" - openshift_upgrade_target is not defined - block: @@ -28,5 +28,5 @@ - set_fact: openshift_image_tag: v{{ openshift_version }} when: > - openshift_image_tag is not defined + openshift_image_tag is not defined or openshift_image_tag == "" or l_force_image_tag_to_version | bool diff --git a/roles/openshift_version/tasks/first_master_containerized_version.yml b/roles/openshift_version/tasks/first_master_containerized_version.yml index 3ed1d2cfe..9eb38cb2b 100644 --- a/roles/openshift_version/tasks/first_master_containerized_version.yml +++ b/roles/openshift_version/tasks/first_master_containerized_version.yml @@ -6,6 +6,7 @@ openshift_version: "{{ openshift_image_tag[1:].split('-')[0] if openshift_image_tag != 'latest' else openshift_image_tag }}" when: - openshift_image_tag is defined + - openshift_image_tag != "" - openshift_version is not defined - not (openshift_version_reinit | default(false)) diff --git a/roles/openshift_version/tasks/first_master_rpm_version.yml b/roles/openshift_version/tasks/first_master_rpm_version.yml index 5d92f90c6..85e440513 100644 --- a/roles/openshift_version/tasks/first_master_rpm_version.yml +++ b/roles/openshift_version/tasks/first_master_rpm_version.yml @@ -5,6 +5,7 @@ openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}" when: - openshift_pkg_version is defined + - openshift_pkg_version != "" - openshift_version is not defined - not (openshift_version_reinit | default(false)) |