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/templates | |
| 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/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 ]]; \ |