summaryrefslogtreecommitdiffstats
path: root/roles/openshift_version
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-08 14:12:52 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-08 14:12:52 -0500
commit7819056aa716356416f421b3916954c040f2824f (patch)
tree99913b7d170157a6b4e5407adcd76a2f9679f170 /roles/openshift_version
parentfe2dbc1d9524b707288bc639e7e2bf71290dbe0b (diff)
downloadopenshift-7819056aa716356416f421b3916954c040f2824f.tar.gz
openshift-7819056aa716356416f421b3916954c040f2824f.tar.bz2
openshift-7819056aa716356416f421b3916954c040f2824f.tar.xz
openshift-7819056aa716356416f421b3916954c040f2824f.zip
Properly cast crio boolean variables to bool
Variables that are specifically booleans should be cast to bool. This is because users may sometimes pass them as string values. This is particularly prevalent when using ini-style inventories. Affected-by: https://github.com/ansible/ansible/issues/34591 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1531592
Diffstat (limited to 'roles/openshift_version')
-rw-r--r--roles/openshift_version/tasks/set_version_containerized.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml
index e02a75eab..a808f050e 100644
--- a/roles/openshift_version/tasks/set_version_containerized.yml
+++ b/roles/openshift_version/tasks/set_version_containerized.yml
@@ -21,7 +21,7 @@
register: cli_image_version
when:
- openshift_version is not defined
- - not openshift_use_crio_only
+ - not openshift_use_crio_only | bool
# Origin latest = pre-release version (i.e. v1.3.0-alpha.1-321-gb095e3a)
- set_fact:
@@ -30,7 +30,7 @@
- openshift_version is not defined
- openshift.common.deployment_type == 'origin'
- cli_image_version.stdout_lines[0].split('-') | length > 1
- - not openshift_use_crio_only
+ - not openshift_use_crio_only | bool
- set_fact:
openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
@@ -45,14 +45,14 @@
when:
- openshift_version is defined
- openshift_version.split('.') | length == 2
- - not openshift_use_crio_only
+ - not openshift_use_crio_only | bool
- 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 openshift_use_crio_only
+ - not openshift_use_crio_only | bool
# 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