summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-30 14:36:14 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-30 15:08:46 -0400
commit5c8e3c5efc9c7cf13923e6fe234fc17c9042419a (patch)
tree90a88c156432bee3b494967d382bbfa4ecfecd11 /roles
parentd4d0e1dc928adfd70e9ee297f214bd12e802c0c3 (diff)
downloadopenshift-5c8e3c5efc9c7cf13923e6fe234fc17c9042419a.tar.gz
openshift-5c8e3c5efc9c7cf13923e6fe234fc17c9042419a.tar.bz2
openshift-5c8e3c5efc9c7cf13923e6fe234fc17c9042419a.tar.xz
openshift-5c8e3c5efc9c7cf13923e6fe234fc17c9042419a.zip
Bug 1322335 - The package name is wrong for rpm upgrade
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_common/tasks/main.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 541efe27a..b6074ff64 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -28,8 +28,12 @@
use_manageiq: "{{ openshift_use_manageiq | default(None) }}"
data_dir: "{{ openshift_data_dir | default(None) }}"
+# Using oo_image_tag_to_rpm_version here is a workaround for how
+# openshift_version is set. That value is computed based on either RPM
+# 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('') }} state=present"
+ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') | oo_image_tag_to_rpm_version }} state=present"
when: not openshift.common.is_containerized | bool
# This invocation also updates the version facts which are necessary