summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-11-14 09:15:45 -0800
committerTim Bielawa <tbielawa@redhat.com>2016-11-14 10:07:37 -0800
commit54820399a202a687b0251febbab64fb590577234 (patch)
tree97c021d0a4a00131736254648e4038e9c2ca682d /roles
parentb29e9340544cbfb127e0a7f6be88f8b4f2818b4d (diff)
downloadopenshift-54820399a202a687b0251febbab64fb590577234.tar.gz
openshift-54820399a202a687b0251febbab64fb590577234.tar.bz2
openshift-54820399a202a687b0251febbab64fb590577234.tar.xz
openshift-54820399a202a687b0251febbab64fb590577234.zip
Fix commit-offsets in version detection for containerized installs
* Applies the chomp_commit_offset logic to container version detection https://bugzilla.redhat.com/show_bug.cgi?id=1389137
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_version/tasks/set_version_containerized.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml
index 8e2702391..718537287 100644
--- a/roles/openshift_version/tasks/set_version_containerized.yml
+++ b/roles/openshift_version/tasks/set_version_containerized.yml
@@ -37,3 +37,8 @@
openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2][1:] | join('-') if openshift.common.deployment_type == 'origin' else cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
when: openshift_version is defined and openshift_version.split('.') | length == 2
+# We finally have the specific version. Now we clean up any strange
+# dangly +c0mm1t-offset tags in the version. See also,
+# openshift_facts.py
+- set_fact:
+ openshift_version: "{{ openshift_version | oo_chomp_commit_offset }}"