diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-07-27 10:57:46 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-03 17:20:52 +0200 |
| commit | 398d5963d57a2022f18c4ded2b85619accb34b1e (patch) | |
| tree | 26d60ab29a181b0818185bb99dc98f62b0232201 | |
| parent | 8926c30ecb60a95eb5a9611810657d100a4a6b18 (diff) | |
| download | openshift-398d5963d57a2022f18c4ded2b85619accb34b1e.tar.gz openshift-398d5963d57a2022f18c4ded2b85619accb34b1e.tar.bz2 openshift-398d5963d57a2022f18c4ded2b85619accb34b1e.tar.xz openshift-398d5963d57a2022f18c4ded2b85619accb34b1e.zip | |
cri-o: skip Set precise containerized version check
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -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, |