launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_updates_bzr1264 into lp:~maas-maintainers/maas/packaging.

Commit message:
debian/maas-region-controller.postinst: Set the correct host for
BROKER_URL (LP: #1065080)

Requested reviews:
  Andres Rodriguez (andreserl)
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1065080 in maas (Ubuntu): "The BROKER_URL sent to a cluster controller has its hostname set 'localhost'."
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1065080

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_updates_bzr1264/+merge/129248
-- 
https://code.launchpad.net/~andreserl/maas/packaging_updates_bzr1264/+merge/129248
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_updates_bzr1264 into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-11 14:43:48 +0000
+++ debian/changelog	2012-10-11 16:39:23 +0000
@@ -13,6 +13,8 @@
       to handle upgrades.
   * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
   * debian/control: Depends on maas-region-controller for maas-dns.
+  * debian/maas-region-controller.postinst: Set the correct host for
+    BROKER_URL (LP: #1065080)
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 10 Oct 2012 11:17:21 -0400
 

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-10-10 11:05:46 +0000
+++ debian/maas-region-controller.postinst	2012-10-11 16:39:23 +0000
@@ -89,7 +89,10 @@
 	local workers_user="maas_workers"
 	local workers_pass="$(pwgen -s 20)"
 	local workers_vhost="/maas_workers"
-	local amqp_host="localhost"
+	local amqp_host=$1
+	if [ -z "$amqp_host" ]; then
+		amqp_host="localhost"
+	fi
 	local amqp_port="5672"
 	if [ -x /usr/sbin/rabbitmqctl ]; then
 		if ! rabbitmqctl list_users | grep -qs "$workers_user"; then
@@ -241,7 +244,7 @@
 	#########################################################
 
 	# Handle celery/rabbitmq publishing
-	configure_maas_workers_rabbitmq_user
+	configure_maas_workers_rabbitmq_user "$ipaddr"
 
 	#########################################################
 	######## add maas.conf to tgt conf.d ####################
@@ -277,6 +280,7 @@
 	if [ -n "$ipaddr" ]; then
 		configure_maas_default_url "$ipaddr"
 		configure_maas_squid_deb_proxy "$ipaddr"
+		configure_maas_workers_rabbitmq_user "$ipaddr"
 	fi
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
@@ -297,7 +301,7 @@
 	restart_rabbitmq
 	configure_maas_txlongpoll_rabbitmq_user
 	# Handle celery/rabbitmq publishing
-	configure_maas_workers_rabbitmq_user
+	configure_maas_workers_rabbitmq_user "$ipaddr"
 	# handle database upgrade
 	if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
 		# source dbconfig-common db config for maas-region-controller