summaryrefslogtreecommitdiffstats
path: root/roles/openshift_version/tasks/set_version_rpm.yml
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-04 11:52:56 -0500
committerGitHub <noreply@github.com>2017-04-04 11:52:56 -0500
commit5cc5815bcf20165525ae283569a5c77eee25180e (patch)
tree6b6f5330a2801a7032655fdfb781550f5161084d /roles/openshift_version/tasks/set_version_rpm.yml
parent8503cd10fd1002f40667d5303b159ed321b5fb7a (diff)
parent1664a447b184b33ff0da4f07501dd706fea9e450 (diff)
downloadopenshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.gz
openshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.bz2
openshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.xz
openshift-5cc5815bcf20165525ae283569a5c77eee25180e.zip
Merge pull request #3639 from ashcrow/otdebug
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_version/tasks/set_version_rpm.yml')
-rw-r--r--roles/openshift_version/tasks/set_version_rpm.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/set_version_rpm.yml b/roles/openshift_version/tasks/set_version_rpm.yml
index 0c2ef4bb7..c7604af1a 100644
--- a/roles/openshift_version/tasks/set_version_rpm.yml
+++ b/roles/openshift_version/tasks/set_version_rpm.yml
@@ -3,7 +3,9 @@
set_fact:
# Expects a leading "-" in inventory, strip it off here, and remove trailing release,
openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}"
- when: openshift_pkg_version is defined and openshift_version is not defined
+ when:
+ - openshift_pkg_version is defined
+ - openshift_version is not defined
# if {{ openshift.common.service_type}}-excluder is enabled,
# the repoquery for {{ openshift.common.service_type}} will not work.