summaryrefslogtreecommitdiffstats
path: root/roles/openshift_version/tasks/masters_and_nodes.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-14 22:00:48 -0500
committerScott Dodson <sdodson@redhat.com>2018-01-17 13:32:14 -0500
commitdd9a27ad1448b2c953b0b45a46dba83f77cc5ad5 (patch)
tree5f48cd3d2fc2cdfe896cdd655ac49436afe34b5b /roles/openshift_version/tasks/masters_and_nodes.yml
parentf244cab9f995ad90b931fe3de890cb864f10d340 (diff)
downloadopenshift-dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5.tar.gz
openshift-dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5.tar.bz2
openshift-dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5.tar.xz
openshift-dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5.zip
Add call to 3.8 playbook in 3.9 upgrade
Diffstat (limited to 'roles/openshift_version/tasks/masters_and_nodes.yml')
-rw-r--r--roles/openshift_version/tasks/masters_and_nodes.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/masters_and_nodes.yml b/roles/openshift_version/tasks/masters_and_nodes.yml
index fbeb22d8b..eddd5ff42 100644
--- a/roles/openshift_version/tasks/masters_and_nodes.yml
+++ b/roles/openshift_version/tasks/masters_and_nodes.yml
@@ -6,9 +6,12 @@
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
+ when:
+ - openshift_version not in rpm_results.results.versions.available_versions.0
+ - openshift_version_reinit | default(false)
+
# block when
when: not openshift_is_atomic | bool