|
@@ -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
|
|
- name: Set containerized version to configure if openshift_image_tag specified
|
|
set_fact:
|
|
set_fact:
|
|
# Expects a leading "v" in inventory, strip it off here unless
|
|
# Expects a leading "v" in inventory, strip it off here unless
|
|
@@ -42,12 +45,18 @@
|
|
when:
|
|
when:
|
|
- openshift_version is defined
|
|
- openshift_version is defined
|
|
- openshift_version.split('.') | length == 2
|
|
- openshift_version.split('.') | length == 2
|
|
|
|
+ - not l_use_crio
|
|
|
|
|
|
- set_fact:
|
|
- 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:] }}"
|
|
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:
|
|
when:
|
|
- openshift_version is defined
|
|
- openshift_version is defined
|
|
- openshift_version.split('.') | length == 2
|
|
- 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
|
|
# We finally have the specific version. Now we clean up any strange
|
|
# dangly +c0mm1t-offset tags in the version. See also,
|
|
# dangly +c0mm1t-offset tags in the version. See also,
|