diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-04 18:32:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 18:32:23 -0400 |
commit | 3db2bb10c0ad5e7ed702bfccdec03562533e8539 (patch) | |
tree | 27e9493d9e5ed24ec1847678b76e02e10d61ce77 /roles/openshift_node/templates/node.service.j2 | |
parent | 145c90c9eb58ae9ce25e7795fcf403a2595d3580 (diff) | |
parent | 31e708a5d440a6ad13f81c4b94ad26e0b2d9587a (diff) | |
download | openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.gz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.bz2 openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.xz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.zip |
Merge pull request #4898 from giuseppe/cri-o
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_node/templates/node.service.j2')
-rw-r--r-- | roles/openshift_node/templates/node.service.j2 | 1 |
1 files changed, 1 insertions, 0 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 |