diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-08 17:47:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 17:47:03 -0500 |
| commit | 96d40700a892353bd8207a1e7c4e7a662ae757cc (patch) | |
| tree | f824745aec679482b1607a90099da6b590bac792 /roles/openshift_version | |
| parent | 74294d8258a4812752434feaf4cd4b512a992af8 (diff) | |
| parent | 7819056aa716356416f421b3916954c040f2824f (diff) | |
| download | openshift-96d40700a892353bd8207a1e7c4e7a662ae757cc.tar.gz openshift-96d40700a892353bd8207a1e7c4e7a662ae757cc.tar.bz2 openshift-96d40700a892353bd8207a1e7c4e7a662ae757cc.tar.xz openshift-96d40700a892353bd8207a1e7c4e7a662ae757cc.zip | |
Merge pull request #6653 from mgugino-upstream-stage/fix-crio-bool
Properly cast crio boolean variables to bool
Diffstat (limited to 'roles/openshift_version')
| -rw-r--r-- | roles/openshift_version/tasks/set_version_containerized.yml | 8 |
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 |