Merge lp:~andreserl/maas/fix_packaging into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Fix packaging to match 1.7 release.

[Andres Rodriguez (andreserl)]

Self approve. Thi is just fixing the packaging to match what was released.

review: Approve

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Andres Rodriguez (andreserl)]

review: Approve

[lp:~andreserl/maas/fix_packaging]

300. By Andres Rodriguez on 2014-08-22

[r=andreserl][bug=][author=andreserl] Fix packaging to match 1.7 release.

[Julian Edwards (julian-edwards)]

Why has this branch got

=== removed file 'debian/maas-dhcp.maas-dhcpv6-server.upstart'

=== added file debian/maas-dhcp.maas-dhcpv6-server.upstart

?

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-22 11:00:58 +0000
+++ debian/changelog	2014-08-22 13:16:32 +0000
@@ -1,7 +1,30 @@
-maas (1.7.0+bzr2772-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.7.0~beta1+bzr2783-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 
+  [ Jeroen Vermeulen ]
+  * debian/extras/99-maas-sudoers
+    debian/maas-dhcp.maas-dhcp-server.upstart
+    debian/maas-dhcp.maas-dhcpv6-server.upstart
+    debian/maas-dhcp.postinst
+    debian/rules
+    - Add second DHCP server instance for IPv6.
+
+  [ Julian Edwards ]
+  * debian/maas-region-controller.postinst: Don't restart RabbitMQ on
+    upgrades, just ensure it's running.  Should prevent a race with the
+    cluster celery restarting.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Ensure cluster celery is
+    started if it also runs on the region.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 19:36:30 -0400
+
+maas (1.7.0~beta1+bzr2781-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release, 1.7.0 Beta 1
+
   [Diogo Matsubara]
   * debian/control:
     - maas-cluster-controller depends on syslinux-dev | 
@@ -14,12 +37,6 @@
     - Let maas user import, including sudo tgt-admin and sudo uec2roottar.
   * debian/maas-cluster-controller.install:
     - Stop installing obsolete file bootresources.yaml.
-  * debian/extras/99-maas-sudoers
-    debian/maas-dhcp.maas-dhcp-server.upstart
-    debian/maas-dhcp.maas-dhcpv6-server.upstart
-    debian/maas-dhcp.postinst
-    debian/rules
-    - Add second DHCP server instance for IPv6.
 
   [ Raphaël Badin ]
   * debian/control:
@@ -51,9 +68,6 @@
     debian/maas-region-controller.postinst
     - Install /var/log/maas/maas.log as a syslog file.
     - Ensure logging is set up for upgrades 
-  * debian/maas-region-controller.postinst: Don't restart RabbitMQ on
-    upgrades, just ensure it's running.  Should prevent a race with the
-    cluster celery restarting.
 
   [ Graham Binns ]
   * debian/maas-region-controller.postinst:
@@ -66,11 +80,8 @@
   * debian/maas-region-controller.postinst: Do not change celery's
     rabbitmq password on upgrade that to not lock remote
     Cluster Controllers if upgrading from 1.5+. (LP: #1300507)
-  * debian/maas-region-controller.postinst: Ensure cluster celery is
-    started if it also runs on the region.
-
-
- -- Julian Edwards <[e-mail]>  Wed, 20 Aug 2014 11:16:20 +1000
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 14:05:40 -0400
 
 maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
 
 
=== added file 'debian/maas-dhcp.maas-dhcpv6-server.upstart'
--- debian/maas-dhcp.maas-dhcpv6-server.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpv6-server.upstart	2014-08-22 13:16:32 +0000
@@ -0,0 +1,65 @@
+description "MAAS instance of ISC DHCP server for IPv6"
+author "Jeroen Vermeulen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+env CONFIG_FILE=/etc/maas/dhcpd6.conf
+env PID_DIR=/run/maas/dhcp
+env PID_FILE=/run/maas/dhcp/dhcpd6.pid
+env LEASES_DIR=/var/lib/maas/dhcp
+env LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases
+
+# This is where we write what interfaces dhcpd should listen on.
+env INTERFACES_FILE=/var/lib/maas/dhcpd6-interfaces
+
+pre-start script
+    if [ ! -f $CONFIG_FILE ]; then
+        echo "$CONFIG_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if [ ! -f $INTERFACES_FILE ]; then
+        echo "$INTERFACES_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if ! /usr/sbin/dhcpd -t -q -6 -cf $CONFIG_FILE > /dev/null 2>&1; then
+        echo "dhcpd self-test failed.  Please fix the config file."
+        echo "The error was: "
+        /usr/sbin/dhcpd -t -6 -cf $CONFIG_FILE
+        stop
+        exit 0
+    fi
+end script
+
+respawn
+script
+    INTERFACES=`cat "${INTERFACES_FILE}"`
+
+    # Allow dhcp server to write lease and pid file.
+    mkdir -p $PID_DIR
+    chown dhcpd:dhcpd $PID_DIR
+
+    # 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
+    chown root:root $LEASES_DIR
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE
+    for LFILE in $LEASES_FILE $LEASES_FILE~; do
+        if [ -e $LFILE ]; then
+            chown root:root $LFILE
+            chmod a+r $LFILE
+        fi
+    done
+
+    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -6 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+end script
 
=== removed file 'debian/maas-dhcp.maas-dhcpv6-server.upstart'
--- debian/maas-dhcp.maas-dhcpv6-server.upstart	2014-08-22 10:58:38 +0000
+++ debian/maas-dhcp.maas-dhcpv6-server.upstart	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-description "MAAS instance of ISC DHCP server for IPv6"
-author "Jeroen Vermeulen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-env CONFIG_FILE=/etc/maas/dhcpd6.conf
-env PID_DIR=/run/maas/dhcp
-env PID_FILE=/run/maas/dhcp/dhcpd6.pid
-env LEASES_DIR=/var/lib/maas/dhcp
-env LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases
-
-# This is where we write what interfaces dhcpd should listen on.
-env INTERFACES_FILE=/var/lib/maas/dhcpd6-interfaces
-
-pre-start script
-    if [ ! -f $CONFIG_FILE ]; then
-        echo "$CONFIG_FILE does not exist.  Aborting."
-        stop
-        exit 0
-    fi
-
-    if [ ! -f $INTERFACES_FILE ]; then
-        echo "$INTERFACES_FILE does not exist.  Aborting."
-        stop
-        exit 0
-    fi
-
-    if ! /usr/sbin/dhcpd -t -q -6 -cf $CONFIG_FILE > /dev/null 2>&1; then
-        echo "dhcpd self-test failed.  Please fix the config file."
-        echo "The error was: "
-        /usr/sbin/dhcpd -t -6 -cf $CONFIG_FILE
-        stop
-        exit 0
-    fi
-end script
-
-respawn
-script
-    INTERFACES=`cat "${INTERFACES_FILE}"`
-
-    # Allow dhcp server to write lease and pid file.
-    mkdir -p $PID_DIR
-    chown dhcpd:dhcpd $PID_DIR
-
-    # 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
-    chown root:root $LEASES_DIR
-    [ -e $LEASES_FILE ] || touch $LEASES_FILE
-    for LFILE in $LEASES_FILE $LEASES_FILE~; do
-        if [ -e $LFILE ]; then
-            chown root:root $LFILE
-            chmod a+r $LFILE
-        fi
-    done
-
-    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -6 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
-end script