summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-17 15:52:27 +0200
committerJan Chaloupka <jchaloup@redhat.com>2017-05-18 14:53:51 +0200
commit0e5b74942ce916f2b9bf96ad298b3bdbbf97a230 (patch)
tree0d90dd35e561d16b408b8756004b25c158b59fe9
parent0090be3aa291b7c02190928dea96ffbaa3faf1ce (diff)
downloadopenshift-0e5b74942ce916f2b9bf96ad298b3bdbbf97a230.tar.gz
openshift-0e5b74942ce916f2b9bf96ad298b3bdbbf97a230.tar.bz2
openshift-0e5b74942ce916f2b9bf96ad298b3bdbbf97a230.tar.xz
openshift-0e5b74942ce916f2b9bf96ad298b3bdbbf97a230.zip
check for rpm version and docker image version equality only if openshift_pkg_version and openshift_image_tag are not defined
-rw-r--r--roles/openshift_version/tasks/main.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index f2f4d16f0..c8cb9e097 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -30,7 +30,8 @@
- set_fact:
openshift_release: "{{ openshift_release | string }}"
- when: openshift_release is defined
+ when:
+ - openshift_release is defined
# Verify that the image tag is in a valid format
- when:
@@ -106,7 +107,11 @@
fail:
msg: "OCP rpm version {{ openshift_rpm_version }} is different from OCP image version {{ openshift_version }}"
# Both versions have the same string representation
- when: openshift_rpm_version != openshift_version
+ when:
+ - openshift_rpm_version != openshift_version
+ # if openshift_pkg_version or openshift_image_tag is defined, user gives a permission the rpm and docker image versions can differ
+ - openshift_pkg_version is not defined
+ - openshift_image_tag is not defined
when:
- is_containerized | bool
- not is_atomic | bool