diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-14 13:09:41 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-14 13:09:41 -0800 |
commit | deb9a793cbb169b964424720f9c3a6ce6b976b09 (patch) | |
tree | a5bf67b272a8ba7829eb2ba0d3eaeface0909a32 /roles/openshift_version/tasks/first_master_containerized_version.yml | |
parent | b90ec246f78ac66c4251996f9bb288875765ccaf (diff) | |
parent | cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa (diff) | |
download | openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.gz openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.bz2 openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.xz openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.zip |
Merge pull request #7124 from mgugino-upstream-stage/fix-version-multi
Automatic merge from submit-queue.
Fix version multi
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_containerized_version.yml')
-rw-r--r-- | roles/openshift_version/tasks/first_master_containerized_version.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/openshift_version/tasks/first_master_containerized_version.yml b/roles/openshift_version/tasks/first_master_containerized_version.yml index 9eb38cb2b..e02a75eab 100644 --- a/roles/openshift_version/tasks/first_master_containerized_version.yml +++ b/roles/openshift_version/tasks/first_master_containerized_version.yml @@ -6,9 +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)) - name: Set containerized version to configure if openshift_release specified set_fact: @@ -22,7 +20,7 @@ docker run --rm {{ openshift_cli_image }}:latest version register: cli_image_version when: - - openshift_version is not defined or openshift_version_reinit | default(false) + - openshift_version is not defined - not openshift_use_crio_only # Origin latest = pre-release version (i.e. v1.3.0-alpha.1-321-gb095e3a) @@ -36,7 +34,7 @@ - set_fact: openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}" - when: openshift_version is not defined or openshift_version_reinit | default(false) + when: openshift_version is not defined # If we got an openshift_version like "3.2", lookup the latest 3.2 container version # and use that value instead. |