Merge lp:~andreserl/maas/maas_systemd_1.8 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Add systemd support for MAAS controlled daemons.

[Martin Pitt (pitti)]

I have a similar question/suggestion as in https://code.launchpad.net/~andreserl/maas/maas_systemd_1.7/+merge/252511 but in general this LGTM. Thanks!

review: Approve

[Andres Rodriguez (andreserl)]

Comments inline!

[Andres Rodriguez (andreserl)]

review: Approve

[Gavin Panella (allenap)]

Wow, configuring systemd looks awful. It's built like no one cares. I don't care a lot about upstart versus systemd, but on configuration, systemd really loses. I'm going to see if there are some m4 macros in systemd to make this *better*. Can we run upstart via systemd perhaps?

[Andres Rodriguez (andreserl)]

In vivid+ we would have to run systemd. On earlier releases upstart will continue to be used.

[Gavin Panella (allenap)]

> In vivid+ we would have to run systemd. On earlier releases upstart
> will continue to be used.

Oh yeah, I know, and I don't mind. I was wondering, only half-joking, if
upstart could be run as a service by systemd, like any other service.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-10 20:37:04 +0000
+++ debian/changelog	2015-03-17 20:12:44 +0000
@@ -1,4 +1,4 @@
-maas (1.8.0~alpha6+bzr3629-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.8.0~alpha6+bzr3661-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 

=== modified file 'debian/control'
--- debian/control	2015-03-06 23:10:41 +0000
+++ debian/control	2015-03-17 20:12:44 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 8.1.0~),
                dh-apport,
+               dh-systemd,
                po-debconf,
                python (>= 2.7),
                python-distribute,

=== added file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-03-17 20:12:44 +0000
@@ -0,0 +1,21 @@
+[Unit]
+Description=MAAS Cluster Controller
+Requires=network-online.target
+After=network-online.target
+ConditionPathExists=/etc/maas/maas_cluster.conf
+# This (pserv.yaml) will go away once streamline
+# config files or move to sqlite.
+ConditionPathExists=/etc/maas/pserv.yaml
+ConditionPathExists=/var/lib/maas/secret
+
+[Service]
+Restart=on-failure
+EnvironmentFile=/etc/maas/maas_cluster.conf
+ExecStart=/bin/sh -ec '\
+    exec /usr/bin/authbind --deep /usr/bin/twistd \
+    --nodaemon --uid=maas --gid=maas --pidfile=/run/maas-cluster.pid \
+    maas-clusterd --config-file=/etc/maas/pserv.yaml > \
+    /var/log/maas/clusterd.log 2>&1'
+
+[Install]
+WantedBy=multi-user.target

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-02-17 15:43:32 +0000
+++ debian/maas-cluster-controller.postinst	2015-03-17 20:12:44 +0000
@@ -14,6 +14,7 @@
     fi
     # Main syslog file.
     if [ ! -f /var/log/maas/maas.log ]; then
+        mkdir -p /var/log/maas
         touch /var/log/maas/maas.log
     fi
 

=== added file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2015-03-17 20:12:44 +0000
@@ -0,0 +1,23 @@
+[Unit]
+Description=MAAS instance of ISC DHCP server for IPv4
+Documentation=man:dhcpd(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+ConditionPathExists=/etc/maas/dhcpd.conf
+ConditionPathExists=/var/lib/maas/dhcpd-interfaces
+
+[Service]
+ExecStartPre=/bin/mkdir -p /run/maas/dhcp
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
+ExecStartPre=/bin/chown dhcpd:dhcpd /run/maas/dhcp
+# The leases files need to be root:root even when dropping privileges
+ExecStart=/bin/sh -ec '\
+    CONFIG_FILE=/etc/maas/dhcpd.conf; \
+    INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces; \
+    [ -e /var/lib/maas/dhcp/dhcpd.leases ] || touch /var/lib/maas/dhcp/dhcpd.leases; \
+    chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \
+    exec dhcpd -user dhcpd -group dhcpd -f -4 -pf /run/maas/dhcp/dhcpd.pid -cf $CONFIG_FILE $INTERFACES_FILE'
+
+[Install]
+WantedBy=multi-user.target

=== added file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2015-03-17 20:12:44 +0000
@@ -0,0 +1,23 @@
+[Unit]
+Description=MAAS instance of ISC DHCP server for IPv6
+Documentation=man:dhcpd(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+ConditionPathExists=/etc/maas/dhcpd6.conf
+ConditionPathExists=/var/lib/maas/dhcpd-interfaces
+
+[Service]
+ExecStartPre=/bin/mkdir -p /run/maas/dhcp
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
+ExecStartPre=/bin/chown dhcpd:dhcpd /run/maas/dhcp
+# The leases files need to be root:root even when dropping privileges
+ExecStart=/bin/sh -ec '\
+    CONFIG_FILE=/etc/maas/dhcpd6.conf; \
+    INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces; \
+    [ -e /var/lib/maas/dhcp/dhcpd6.leases ] || touch /var/lib/maas/dhcp/dhcpd6.leases; \
+    chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \
+    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid -cf $CONFIG_FILE $INTERFACES_FILE'
+
+[Install]
+WantedBy=multi-user.target

=== added file 'debian/maas-proxy.maas-proxy.service'
--- debian/maas-proxy.maas-proxy.service	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.maas-proxy.service	2015-03-17 20:12:44 +0000
@@ -0,0 +1,13 @@
+[Unit]
+Description=MAAS Proxy
+Requires=network-online.target
+After=network-online.target
+ConditionPathExists=/etc/maas/maas-proxy.conf
+
+[Service]
+ExecStartPre=/bin/mkdir -p /run/maas/proxy
+ExecStartPre=/bin/sh /usr/share/maas/maas-proxy-common.sh
+ExecStart=/usr/bin/squid -N -f /etc/maas/maas-proxy.conf
+
+[Install]
+WantedBy=multi-user.target

=== added file 'debian/maas-region-controller-min.maas-regiond.service'
--- debian/maas-region-controller-min.maas-regiond.service	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond.service	2015-03-17 20:12:44 +0000
@@ -0,0 +1,17 @@
+[Unit]
+Description=MAAS Region Controller
+Requires=network-online.target
+After=network-online.target
+# This will go away one we support new config files.
+ConditionPathExists=/etc/maas/maas_local_settings.py
+
+[Service]
+Restart=on-failure
+Environment="DJANGO_SETTINGS_MODULE=maas.settings"
+Environment="PYTHONPATH=/usr/share/maas"
+ExecStart=/bin/sh -ec '\
+    exec /usr/bin/authbind --deep /usr/bin/twistd \
+    --nodaemon --pidfile= maas-regiond > /var/log/maas/regiond.log 2>&1'
+
+[Install]
+WantedBy=multi-user.target

=== modified file 'debian/rules'
--- debian/rules	2015-03-02 20:15:22 +0000
+++ debian/rules	2015-03-17 20:12:44 +0000
@@ -6,14 +6,29 @@
 py_enums := $(wildcard src/*/enum.py)
 
 %:
-	dh $@ --with python2,apport --buildsystem=python_distutils
+	dh $@ --with python2,apport,systemd --buildsystem=python_distutils
 
 override_dh_installinit:
+	# maas-clusterd
+	dh_systemd_enable --name maas-clusterd
 	dh_installinit --name maas-clusterd
+	dh_systemd_start --name maas-clusterd
+	# maas-regiond
+	dh_systemd_enable --name maas-regiond
 	dh_installinit --name maas-regiond
+	dh_systemd_start --name maas-regiond
+	# maas-dhcpd
+	dh_systemd_enable --name maas-dhcpd
 	dh_installinit --name maas-dhcpd
+	dh_systemd_start --name maas-dhcpd
+	# maas-dhcpd6
+	dh_systemd_enable --name maas-dhcpd6
 	dh_installinit --name maas-dhcpd6
+	dh_systemd_start --name maas-dhcpd6
+	# maas-proxy
+	dh_systemd_enable --name maas-proxy
 	dh_installinit --name maas-proxy
+	dh_systemd_start --name maas-proxy
 
 override_dh_auto_build:
 	dh_auto_build