diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-01 12:45:05 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-01 12:45:05 -0300 |
commit | 87cf5935b0a480aa2b2f4333a48173ef0b44c749 (patch) | |
tree | 72755a06b2e9387e45440bbf50707e6bb7544bfd /roles/openshift_version/tasks/set_version_containerized.yml | |
parent | a5a736f4042abca402f7648a830968c205163a34 (diff) | |
download | openshift-87cf5935b0a480aa2b2f4333a48173ef0b44c749.tar.gz openshift-87cf5935b0a480aa2b2f4333a48173ef0b44c749.tar.bz2 openshift-87cf5935b0a480aa2b2f4333a48173ef0b44c749.tar.xz openshift-87cf5935b0a480aa2b2f4333a48173ef0b44c749.zip |
Fix installing release 3.1 not converting to precise version.
Diffstat (limited to 'roles/openshift_version/tasks/set_version_containerized.yml')
-rw-r--r-- | roles/openshift_version/tasks/set_version_containerized.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml index 0da3484a9..f3eab4831 100644 --- a/roles/openshift_version/tasks/set_version_containerized.yml +++ b/roles/openshift_version/tasks/set_version_containerized.yml @@ -2,7 +2,7 @@ - name: Set containerized version to configure if openshift_image_tag specified set_fact: openshift_version: "{{ openshift_image_tag.split('v',1)[1] }}" - when: openshift_image_tag is defined + when: openshift_image_tag is defined and openshift_version is not defined - name: Set containerized version to configure if openshift_release specified set_fact: @@ -21,6 +21,9 @@ 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 not defined +- debug: msg="{{ openshift_version }}" +#- debug: var=openshift_version.split('.') + # If we got an openshift_version like "3.2", lookup the latest 3.2 container version # and use that value instead. - name: Set precise containerized version to configure if openshift_release specified @@ -32,3 +35,4 @@ - set_fact: 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 + |