Merge pull request #16378 from giuseppe/node-syscontainer-init-dnsmasq

Automatic merge from submit-queue (batch tested with PRs 16384, 16327, 16199, 16286, 16378) node, systemcontainer: initialize dnsmasq This is already done for the version of node installed on the host.
openshift · Sep 16, 2017 · 7bedfbb · 7bedfbb
2 parents 61099d2 + 8ed8c53
commit 7bedfbb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/images/node/system-container/manifest.json b/images/node/system-container/manifest.json
@@ -1,6 +1,7 @@
 {
     "version": "1.0",
     "defaultValues": {
+        "DNS_DOMAIN": "cluster.local",
         "ORIGIN_CONFIG_DIR": "/etc/origin",
         "ORIGIN_DATA_DIR": "/var/lib/origin",
         "MASTER_SERVICE": "atomic-openshift-master.service",

diff --git a/images/node/system-container/service.template b/images/node/system-container/service.template
@@ -4,10 +4,19 @@ After=${OPENVSWITCH_SERVICE}
 Wants=${DOCKER_SERVICE}
 After=$NAME-dep.service
 After=${MASTER_SERVICE}
+Requires=dnsmasq.service
+After=dnsmasq.service
 
 [Service]
+Type=notify
 EnvironmentFile=/etc/sysconfig/$NAME
 EnvironmentFile=/etc/sysconfig/$NAME-dep
+
+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,/${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:
+
 ExecStartPre=/bin/bash -c 'export -p > /run/$NAME-env'
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP