Merge lp:~smoser/maas/packaging.1231693 into lp:~maas-maintainers/maas/packaging

[Scott Moser]

revert maas-dhcp-server upstart job to quantal-behavior-only.

This knowingly stops saucy level packages from running with
isc-dhcpd-server from precise. That is intended because we are more
interested in supporting isc-dhcpd-server from the cloud-archive which
will be a newer version.

One of these 2 branches can be chosen. Either
a.
https://code.launchpad.net/~smoser/maas/packaging.1231693-2/+merge/188967
or
https://code.launchpad.net/~smoser/maas/packaging.1231693/+merge/188932

I'm really OK with either. One is more complex but supports more scenarios
the other (this one) is a simpler upstart job that only supports one version of isc-dhcp (quantal-saucy version).

[Andres Rodriguez (andreserl)]

This lgtm! Provided that the backport to precise is no longer going to use the DHCP from precise (but rather a backported one) then I approve these changes.

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

[Julian Edwards (julian-edwards)]

On 04/10/13 00:05, Andres Rodriguez wrote:
> This knowingly stops saucy level packages from running with
> isc-dhcpd-server from precise. That is intended because we are more
> interested in supporting isc-dhcpd-server from the cloud-archive which
> will be a newer version.

The tests in the QA lab will need to be fixed to use the cloud archive now.

=== modified file 'debian/control'
--- debian/control	2013-10-02 19:37:31 +0000
+++ debian/control	2013-10-02 21:37:27 +0000
@@ -249,7 +249,7 @@
 
 Package: maas-dhcp
 Architecture: all
-Depends: isc-dhcp-server, ${misc:Depends}
+Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends}
 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)

=== modified file 'debian/maas-dhcp.maas-dhcp-server.upstart'
--- debian/maas-dhcp.maas-dhcp-server.upstart	2013-05-21 13:17:57 +0000
+++ debian/maas-dhcp.maas-dhcp-server.upstart	2013-10-02 21:37:27 +0000
@@ -37,7 +37,6 @@
 
 respawn
 script
-    RELEASE=`lsb_release --codename --short`
     INTERFACES=`cat "${INTERFACES_FILE}"`
 
     # Allow dhcp server to write lease and pid file.
@@ -47,22 +46,20 @@
     # As of Quantal, the leases file must be owned by root:root (even though
     # the daemon will run under an unprivileged user).
     # In Precise, ownership was supposed to be dhcpd:dhcpd.
+    #
+    # maas packages on saucy are only supported with newer isc-dhcp via
+    # the cloud-archive.  See bug 1231693 for more information, including
+    # a patch that would actually work to support all, but is complex.
+    
     mkdir -p $LEASES_DIR
-    if [ "$RELEASE" = "precise" ]; then
-        owner_group="dhcpd:dhcpd"
-        dhcpd_owner_opts=""
-    else
-        owner_group="root:root"
-        dhcpd_owner_opts="-user dhcpd -group dhcpd"
-    fi
-    chown $owner_group $LEASES_DIR
+    chown root:root $LEASES_DIR
     [ -e $LEASES_FILE ] || touch $LEASES_FILE
     for LFILE in $LEASES_FILE $LEASES_FILE~; do
         if [ -e $LFILE ]; then
-            chown $owner_group $LFILE
+            chown root:root $LFILE
             chmod a+r $LFILE
         fi
     done
 
-    exec /usr/sbin/dhcpd ${dhcpd_owner_opts} -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
 end script