diff options
| author | Steve Milner <smilner@redhat.com> | 2017-07-17 14:28:46 -0400 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-03 17:20:51 +0200 |
| commit | 85b9622751913619e57b9380b6051dc612e990b9 (patch) | |
| tree | a5edd66c9212057a38e82a676a9f60e89a9f060f /roles/openshift_node | |
| parent | ba71fba1dc64a05b9cc26b72263255a915601c84 (diff) | |
| download | openshift-85b9622751913619e57b9380b6051dc612e990b9.tar.gz openshift-85b9622751913619e57b9380b6051dc612e990b9.tar.bz2 openshift-85b9622751913619e57b9380b6051dc612e990b9.tar.xz openshift-85b9622751913619e57b9380b6051dc612e990b9.zip | |
cri-o: Add cri-o as a Wants in node units
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/templates/node.service.j2 | 1 | ||||
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2 index e12a52c15..3d0ae3bbd 100644 --- a/roles/openshift_node/templates/node.service.j2 +++ b/roles/openshift_node/templates/node.service.j2 @@ -8,6 +8,7 @@ Wants={{ openshift.docker.service_name }}.service Documentation=https://github.com/openshift/origin Requires=dnsmasq.service After=dnsmasq.service +{% if openshift.docker.use_crio %}Wants=cri-o.service{% endif %} [Service] Type=notify diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service index 4c47f8c0d..c4580be1f 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.common.service_type }}-node.service Before={{ openshift.common.service_type }}-node.service - +{% if openshift.docker.use_crio %}Wants=cri-o.service{% endif %} [Service] ExecStart=/bin/bash -c "if [[ -f /usr/bin/docker-current ]]; then echo \"DOCKER_ADDTL_BIND_MOUNTS=--volume=/usr/bin/docker-current:/usr/bin/docker-current:ro --volume=/etc/sysconfig/docker:/etc/sysconfig/docker:ro\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; fi" |