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_node/tasks | |
| 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_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 103572291..754ecacaf 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -4,7 +4,7 @@ when: - (not ansible_selinux or ansible_selinux.status != 'enabled') - openshift_deployment_type == 'openshift-enterprise' - - not openshift_use_crio + - not openshift_use_crio | bool - include_tasks: dnsmasq_install.yml - include_tasks: dnsmasq.yml @@ -50,7 +50,7 @@ name: cri-o enabled: yes state: restarted - when: openshift_use_crio + when: openshift_use_crio | bool register: task_result failed_when: - task_result is failed diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index 30ef9ef44..d7dce6969 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/roles/openshift_node/tasks/openvswitch_system_container.yml @@ -1,11 +1,11 @@ --- - set_fact: l_service_name: "cri-o" - when: openshift_use_crio + when: openshift_use_crio | bool - set_fact: l_service_name: "{{ openshift_docker_service_name }}" - when: not openshift_use_crio + when: not openshift_use_crio | bool - name: Pre-pull OpenVSwitch system container image command: > |