diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-04 18:32:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 18:32:23 -0400 |
| commit | 3db2bb10c0ad5e7ed702bfccdec03562533e8539 (patch) | |
| tree | 27e9493d9e5ed24ec1847678b76e02e10d61ce77 /roles/openshift_version | |
| parent | 145c90c9eb58ae9ce25e7795fcf403a2595d3580 (diff) | |
| parent | 31e708a5d440a6ad13f81c4b94ad26e0b2d9587a (diff) | |
| download | openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.gz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.bz2 openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.xz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.zip | |
Merge pull request #4898 from giuseppe/cri-o
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_version')
| -rw-r--r-- | roles/openshift_version/tasks/set_version_containerized.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml index 0ec4c49d6..4d9f72f01 100644 --- a/roles/openshift_version/tasks/set_version_containerized.yml +++ b/roles/openshift_version/tasks/set_version_containerized.yml @@ -1,4 +1,7 @@ --- +- set_fact: + l_use_crio: "{{ openshift_docker_use_crio | default(false) }}" + - name: Set containerized version to configure if openshift_image_tag specified set_fact: # Expects a leading "v" in inventory, strip it off here unless @@ -42,12 +45,18 @@ when: - openshift_version is defined - openshift_version.split('.') | length == 2 + - not l_use_crio - 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 - openshift_version.split('.') | length == 2 + - not l_use_crio + +# TODO: figure out a way to check for the openshift_version when using CRI-O. +# We should do that using the images in the ostree storage so we don't have +# to pull them again. # We finally have the specific version. Now we clean up any strange # dangly +c0mm1t-offset tags in the version. See also, |