diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
| commit | 7dceb6260a333e29c922dad8613ae6a0946fa07b (patch) | |
| tree | 1c7c40a6c68e0668af2e2a5d0b865a4ef6af371d /roles/openshift_node/templates | |
| parent | 501e7897b7becb1e5a5c7875b40675d1e7296ed7 (diff) | |
| parent | 13e73c31a827d6fca810e120a7b3b6573b2eeb4b (diff) | |
| download | openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.gz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.bz2 openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.xz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.zip | |
Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origin-components
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/openshift.docker.node.service | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2 index 777f4a449..7405cfd73 100644 --- a/roles/openshift_node/templates/node.service.j2 +++ b/roles/openshift_node/templates/node.service.j2 @@ -6,7 +6,7 @@ After=ovsdb-server.service After=ovs-vswitchd.service Wants={{ openshift_docker_service_name }}.service Documentation=https://github.com/openshift/origin -Requires=dnsmasq.service +Wants=dnsmasq.service After=dnsmasq.service {% if openshift_use_crio | bool %}Wants=cri-o.service{% endif %} diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service index ae7b147a6..23823e3e5 100644 --- a/roles/openshift_node/templates/openshift.docker.node.service +++ b/roles/openshift_node/templates/openshift.docker.node.service @@ -13,7 +13,7 @@ After=ovs-vswitchd.service Wants={{ openshift_service_type }}-master.service Requires={{ openshift_service_type }}-node-dep.service After={{ openshift_service_type }}-node-dep.service -Requires=dnsmasq.service +Wants=dnsmasq.service After=dnsmasq.service [Service] |