Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

node, systemcontainer: initialize dnsmasq #16378

Merged
merged 2 commits into from
Sep 16, 2017
Merged

node, systemcontainer: initialize dnsmasq #16378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a61046b
node,syscontainer: initialize dnsmasq
giuseppe Sep 15, 2017
8ed8c53
node,syscontainer: enable Type=notify
giuseppe Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions images/node/system-container/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 9 additions & 0 deletions images/node/system-container/service.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down