From 54820399a202a687b0251febbab64fb590577234 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Mon, 14 Nov 2016 09:15:45 -0800
Subject: 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
---
roles/openshift_version/tasks/set_version_containerized.yml | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'roles/openshift_version')
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 }}"
--
cgit v1.2.3