summaryrefslogtreecommitdiffstats
path: root/roles/container_runtime/tasks
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-08 17:47:03 -0500
committerGitHub <noreply@github.com>2018-01-08 17:47:03 -0500
commit96d40700a892353bd8207a1e7c4e7a662ae757cc (patch)
treef824745aec679482b1607a90099da6b590bac792 /roles/container_runtime/tasks
parent74294d8258a4812752434feaf4cd4b512a992af8 (diff)
parent7819056aa716356416f421b3916954c040f2824f (diff)
downloadopenshift-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/container_runtime/tasks')
-rw-r--r--roles/container_runtime/tasks/common/post.yml2
-rw-r--r--roles/container_runtime/tasks/systemcontainer_crio.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/container_runtime/tasks/common/post.yml b/roles/container_runtime/tasks/common/post.yml
index b90190ebf..23fd8528a 100644
--- a/roles/container_runtime/tasks/common/post.yml
+++ b/roles/container_runtime/tasks/common/post.yml
@@ -22,5 +22,5 @@
- include_tasks: setup_docker_symlink.yml
when:
- - openshift_use_crio
+ - openshift_use_crio | bool
- dockerstat.stat.islnk is defined and not (dockerstat.stat.islnk | bool)
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index eedb18604..d588f2618 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -104,4 +104,4 @@
# 'docker login'
- include_tasks: common/post.yml
vars:
- openshift_docker_alternative_creds: "{{ openshift_use_crio_only }}"
+ openshift_docker_alternative_creds: "{{ openshift_use_crio_only | bool }}"