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/masters_and_nodes.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/masters_and_nodes.yml')
-rw-r--r-- | roles/openshift_version/tasks/masters_and_nodes.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/roles/openshift_version/tasks/masters_and_nodes.yml b/roles/openshift_version/tasks/masters_and_nodes.yml index eddd5ff42..c4dbc2a5f 100644 --- a/roles/openshift_version/tasks/masters_and_nodes.yml +++ b/roles/openshift_version/tasks/masters_and_nodes.yml @@ -8,10 +8,7 @@ fail: msg: "OCP rpm version {{ rpm_results.results.versions.available_versions.0 }} is different from OCP image version {{ openshift_version }}" # Both versions have the same string representation - when: - - openshift_version not in rpm_results.results.versions.available_versions.0 - - openshift_version_reinit | default(false) - + when: rpm_results.results.versions.available_versions.0 != openshift_version # block when when: not openshift_is_atomic | bool |