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/templates | |
| 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/templates')
| -rw-r--r-- | roles/openshift_node/templates/node.service.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2 index da751bd65..777f4a449 100644 --- a/roles/openshift_node/templates/node.service.j2 +++ b/roles/openshift_node/templates/node.service.j2 @@ -8,7 +8,7 @@ Wants={{ openshift_docker_service_name }}.service Documentation=https://github.com/openshift/origin Requires=dnsmasq.service After=dnsmasq.service -{% if openshift_use_crio %}Wants=cri-o.service{% endif %} +{% if openshift_use_crio | bool %}Wants=cri-o.service{% endif %} [Service] Type=notify diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index f091263f5..5f2a94ea2 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -14,7 +14,7 @@ imageConfig: latest: {{ openshift_node_image_config_latest }} kind: NodeConfig kubeletArguments: {{ l2_openshift_node_kubelet_args | default(None) | lib_utils_to_padded_yaml(level=1) }} -{% if openshift_use_crio %} +{% if openshift_use_crio | bool %} container-runtime: - remote container-runtime-endpoint: diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service index 873744f34..9fe779057 100644 --- a/roles/openshift_node/templates/openshift.docker.node.dep.service +++ b/roles/openshift_node/templates/openshift.docker.node.dep.service @@ -3,7 +3,7 @@ Requires={{ openshift_docker_service_name }}.service After={{ openshift_docker_service_name }}.service PartOf={{ openshift_service_type }}-node.service Before={{ openshift_service_type }}-node.service -{% if openshift_use_crio %}Wants=cri-o.service{% endif %} +{% if openshift_use_crio | bool %}Wants=cri-o.service{% endif %} [Service] ExecStart=/bin/bash -c 'if [[ -f /usr/bin/docker-current ]]; \ |