summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 17:07:01 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 17:07:01 -0400
commit7967d127716de50f63dca9bd137f43ab642770bf (patch)
treef8d4826c58fff02dd7e1e24bccbee2ba79ab4a54 /roles/openshift_common
parentdf44d99957b9d44bf9d221b224a46865c3224d2c (diff)
parent0879620498b1251f3a375b9a5657c16dd571906a (diff)
downloadopenshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.gz
openshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.bz2
openshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.xz
openshift-7967d127716de50f63dca9bd137f43ab642770bf.zip
Merge pull request #1718 from brenton/docker1
Containerized installs on RHEL were downgrading docker unnecessarily
Diffstat (limited to 'roles/openshift_common')
-rw-r--r--roles/openshift_common/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 59ca659b5..eda43b9f8 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -33,7 +33,7 @@
# versions or image tags. openshift_common's usage requires that it be a RPM
# version and openshift_cli expects it to be an image tag.
- name: Install the base package for versioning
- action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') | oo_image_tag_to_rpm_version }} state=present"
+ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present"
when: not openshift.common.is_containerized | bool
- name: Set version facts