diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 16:20:10 -0400 |
| commit | 47f50d5d1a7b4beb89479d9452b95e1c1030b8dc (patch) | |
| tree | 18501f6ab11fbebd3c2189d9481f666d2b3c8cf0 /roles | |
| parent | 4e01bd4a87088f53af309b36ce4da431888fcaf4 (diff) | |
| parent | 337b9e4a842cfd7ec6705fd1501cc9c2991a694f (diff) | |
| download | openshift-47f50d5d1a7b4beb89479d9452b95e1c1030b8dc.tar.gz openshift-47f50d5d1a7b4beb89479d9452b95e1c1030b8dc.tar.bz2 openshift-47f50d5d1a7b4beb89479d9452b95e1c1030b8dc.tar.xz openshift-47f50d5d1a7b4beb89479d9452b95e1c1030b8dc.zip | |
Merge pull request #1803 from sdodson/issue1800
Fix image version handling for v1.2.0-rc1
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 5 |
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 |