summaryrefslogtreecommitdiffstats
path: root/roles/openshift_version
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2016-11-14 11:29:57 -0800
committerGitHub <noreply@github.com>2016-11-14 11:29:57 -0800
commite5459adc0dce4995c23945e20e5bb833802acb80 (patch)
treecea9b48df1a5be3509c3d702d08dd95d55458b42 /roles/openshift_version
parent126734103073a188bb03e7a99edc7af18fd32266 (diff)
parent54820399a202a687b0251febbab64fb590577234 (diff)
downloadopenshift-e5459adc0dce4995c23945e20e5bb833802acb80.tar.gz
openshift-e5459adc0dce4995c23945e20e5bb833802acb80.tar.bz2
openshift-e5459adc0dce4995c23945e20e5bb833802acb80.tar.xz
openshift-e5459adc0dce4995c23945e20e5bb833802acb80.zip
Merge pull request #2798 from tbielawa/BZ1389137
Fix commit-offsets in version detection for containerized installs
Diffstat (limited to 'roles/openshift_version')
-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 }}"