Merge lp:~julian-edwards/maas/1.6-packaging-no-rabbit-restarts into lp:~maas-maintainers/maas/packaging.trusty

[Julian Edwards]

Ensure rabbit is not restarted unnecessarily on upgrades, and boost bzr revno to latest version

[Jeroen T. Vermeulen (jtv)]

Generally good, but this doesn't see any difference between “rabbit is completely broken and refused to start” and “everything's fine, rabbit's already running.” Is that a problem? If so, is there anything we can do about it?

review: Approve

[Julian Edwards (julian-edwards)]

I honestly have no idea, we need a packaging expert. Thanks for reviewing1

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-19 16:42:00 +0000
+++ debian/changelog	2014-08-21 08:42:03 +0000
@@ -1,3 +1,16 @@
+maas (1.6.1+bzr2550-0ubuntu1~ppa1) trusty; urgency=medium
+
+  * New upstream bugfix release:
+    - Auto-link node MACs to Networks (LP: #1341619)
+
+  [ 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.
+  * debian/rules: Pull upstream branch from the right place.
+
+ -- Julian Edwards <[e-mail]>  Thu, 21 Aug 2014 18:38:27 +1000
+
 maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium
 
   * New upstream release 1.6.0

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-08-19 16:42:00 +0000
+++ debian/maas-region-controller.postinst	2014-08-21 08:42:03 +0000
@@ -21,6 +21,10 @@
 	invoke-rc.d rabbitmq-server restart || true
 }
 
+ensure_rabbitmq_started(){
+	invoke-rc.d rabbitmq-server start || true
+}
+
 restart_postgresql(){
 	invoke-rc.d --force postgresql restart || true
 }
@@ -269,8 +273,7 @@
 	ipaddr="$RET"
 	configure_maas_default_url "$ipaddr"
 	configure_maas_squid_deb_proxy "$ipaddr"
-	# make sure rabbitmq is running
-	restart_rabbitmq
+	ensure_rabbitmq_started
 	configure_maas_txlongpoll_rabbitmq_user
 	if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
 		# Handle celery/rabbitmq publishing

=== modified file 'debian/rules'
--- debian/rules	2014-04-07 14:26:28 +0000
+++ debian/rules	2014-08-21 08:42:03 +0000
@@ -53,4 +53,4 @@
               | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
 	bzr export -r $(REV) --root=maas-$(VER).orig \
-             maas_$(VER).orig.tar.gz lp:maas/1.5
+             maas_$(VER).orig.tar.gz lp:maas/1.6