summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates/node.service.j2
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-30 08:06:17 -0400
committerScott Dodson <sdodson@redhat.com>2017-06-30 16:22:53 -0400
commitd9c30f08cebe462a62e9c5131b6e3cec6b01e80a (patch)
tree3545400753891e2965d7c2b0963d2806630bb08f /roles/openshift_node/templates/node.service.j2
parentd195bb2dba76da80df33b777a13d2d719e74b735 (diff)
downloadopenshift-d9c30f08cebe462a62e9c5131b6e3cec6b01e80a.tar.gz
openshift-d9c30f08cebe462a62e9c5131b6e3cec6b01e80a.tar.bz2
openshift-d9c30f08cebe462a62e9c5131b6e3cec6b01e80a.tar.xz
openshift-d9c30f08cebe462a62e9c5131b6e3cec6b01e80a.zip
Use default ports for dnsmasq and node dns
Diffstat (limited to 'roles/openshift_node/templates/node.service.j2')
-rw-r--r--roles/openshift_node/templates/node.service.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2
index fed8e21f5..d4f0b7762 100644
--- a/roles/openshift_node/templates/node.service.j2
+++ b/roles/openshift_node/templates/node.service.j2
@@ -14,7 +14,7 @@ Type=notify
EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-node
Environment=GOTRACEBACK=crash
ExecStartPre=/usr/bin/cp /etc/origin/node/node-dnsmasq.conf /etc/dnsmasq.d/
-ExecStartPre=/usr/bin/dbus-send --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers array:string:/in-addr.arpa/127.0.0.1#{{ r_openshift_node_dns_port}},/{{ openshift.common.dns_domain }}/127.0.0.1#{{ r_openshift_node_dns_port}}
+ExecStartPre=/usr/bin/dbus-send --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers array:string:/in-addr.arpa/127.0.0.1,/{{ openshift.common.dns_domain }}/127.0.0.1
ExecStopPost=/usr/bin/rm /etc/dnsmasq.d/node-dnsmasq.conf
ExecStopPost=/usr/bin/dbus-send --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers array:string:
ExecStart=/usr/bin/openshift start node --config=${CONFIG_FILE} $OPTIONS