summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-04-25 12:52:43 -0400
committerScott Dodson <sdodson@redhat.com>2016-04-25 13:58:33 -0400
commitb90fb397908c4e5f9001724e7f8ddcc25f4ffdea (patch)
tree13e79f1befe7a2011fbece21233317b30d8dba85 /roles
parent04b52454275572f9d09e76c6ce46bdd60aa46c72 (diff)
downloadopenshift-b90fb397908c4e5f9001724e7f8ddcc25f4ffdea.tar.gz
openshift-b90fb397908c4e5f9001724e7f8ddcc25f4ffdea.tar.bz2
openshift-b90fb397908c4e5f9001724e7f8ddcc25f4ffdea.tar.xz
openshift-b90fb397908c4e5f9001724e7f8ddcc25f4ffdea.zip
Fix image version handling for v1.2.0-rc1
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_docker/tasks/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml
index 23613b762..c4cf2b17a 100644
--- a/roles/openshift_docker/tasks/main.yml
+++ b/roles/openshift_docker/tasks/main.yml
@@ -9,7 +9,8 @@
when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool and openshift_image_tag is not defined
- set_fact:
- l_image_tag: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0] }}"
+ l_image_tag: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2] | join('-') if openshift.common.deployment_type == 'origin' else
+ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0] }}"
when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool and openshift_image_tag is not defined
- set_fact:
@@ -24,5 +25,5 @@
- role: docker
local_facts:
openshift_image_tag: "{{ l_image_tag }}"
- openshift_version: "{{ l_image_tag if l_image_tag is defined else '' | oo_image_tag_to_rpm_version }}"
+ openshift_version: "{{ l_image_tag.split('-')[0] if l_image_tag is defined else '' | oo_image_tag_to_rpm_version }}"
when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool