diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-02-12 17:46:24 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-02-13 16:32:36 -0500 |
| commit | cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa (patch) | |
| tree | 272b8d3867998590b690af95d56297fbc2a2e348 /roles/openshift_version/tasks/masters_and_nodes.yml | |
| parent | 864d3bd62d28ea2ac10eaef4b767ce3fc7189bba (diff) | |
| download | openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.gz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.bz2 openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.xz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.zip | |
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/masters_and_nodes.yml b/roles/openshift_version/tasks/masters_and_nodes.yml index fbeb22d8b..c4dbc2a5f 100644 --- a/roles/openshift_version/tasks/masters_and_nodes.yml +++ b/roles/openshift_version/tasks/masters_and_nodes.yml @@ -6,7 +6,7 @@ include_tasks: check_available_rpms.yml - name: Fail if rpm version and docker image version are different fail: - msg: "OCP rpm version {{ openshift_rpm_version }} is different from OCP image version {{ openshift_version }}" + 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: rpm_results.results.versions.available_versions.0 != openshift_version # block when |