diff options
author | Michael Gugino <mgugino@redhat.com> | 2018-01-08 14:12:52 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2018-01-08 14:12:52 -0500 |
commit | 7819056aa716356416f421b3916954c040f2824f (patch) | |
tree | 99913b7d170157a6b4e5407adcd76a2f9679f170 /roles/openshift_node/tasks | |
parent | fe2dbc1d9524b707288bc639e7e2bf71290dbe0b (diff) | |
download | openshift-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_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: > |