summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-24 22:00:12 -0500
committerGitHub <noreply@github.com>2018-01-24 22:00:12 -0500
commit91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e (patch)
tree972ee65122f100cf0b89d47572a70c28b426c270
parent735690ff683836c9dd929e20af24e23026aca8cb (diff)
parent94a16a5ec33d4beed6fe7ed7e2665c52619ba480 (diff)
downloadopenshift-91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e.tar.gz
openshift-91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e.tar.bz2
openshift-91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e.tar.xz
openshift-91d82a4acac88f7361bb9c82b9f94d2f53fb8c1e.zip
Merge pull request #6843 from rajatchopra/bugdnsmasq
Change dnsmasq Requires to Wants
-rw-r--r--roles/openshift_node/templates/node.service.j22
-rw-r--r--roles/openshift_node/templates/openshift.docker.node.service2
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]