Merge lp:~andreserl/maas/packaging.trusty.lp1300507 into lp:~maas-maintainers/maas/packaging.trusty

[Andres Rodriguez]

debian/maas-region-controller.postinst: Do not change celery's rabbitmq
password on upgrade to not lock remote Cluster Controllers if upgrading
from 1.5+. (LP: #1300507)

[Andres Rodriguez (andreserl)]

Backporting and making sure this only happens on upgrade, not on a clean install.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-19 12:40:09 +0000
+++ debian/changelog	2014-08-19 16:47:23 +0000
@@ -24,6 +24,11 @@
   * debian/extras/99-maas-sudoers: Add permissions for tgt-admin and
     uec2roottar
 
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Do not change celery's rabbitmq
+    password on upgrade to not lock remote Cluster Controllers if upgrading
+    from 1.5+. (LP: #1300507)
+
  -- Julian Edwards <[e-mail]>  Tue, 19 Aug 2014 22:34:30 +1000
 
 maas (1.5.3+bzr2287-0ubuntu1) trusty; urgency=medium
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-08-19 02:59:49 +0000
+++ debian/maas-region-controller.postinst	2014-08-19 16:47:23 +0000
@@ -219,10 +219,8 @@
 	########## Configure worker rabbitmq config ###########
 	#########################################################
 
-	if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
-		# Handle celery/rabbitmq publishing
-		configure_maas_workers_rabbitmq_user "$ipaddr"
-	fi
+	# Handle celery/rabbitmq publishing
+	configure_maas_workers_rabbitmq_user "$ipaddr"
 
 	#########################################################
 	################  Configure Database  ###################
@@ -274,8 +272,10 @@
 	# make sure rabbitmq is running
 	restart_rabbitmq
 	configure_maas_txlongpoll_rabbitmq_user
-	# Handle celery/rabbitmq publishing
-	configure_maas_workers_rabbitmq_user "$ipaddr"
+	if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
+		# Handle celery/rabbitmq publishing
+		configure_maas_workers_rabbitmq_user "$ipaddr"
+	fi
 	# handle database upgrade
 	if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
 		# source dbconfig-common db config for maas-region-controller