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

Proposed by Andres Rodriguez on 2012-10-11
Status: Merged
Approved by: Andres Rodriguez on 2012-10-11
Approved revision: 133
Merged at revision: 132
Proposed branch: lp:~andreserl/maas/packaging_updates_bzr1264
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 54 lines (+9/-3)
2 files modified
debian/changelog (+2/-0)
debian/maas-region-controller.postinst (+7/-3)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_updates_bzr1264
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2012-10-11
Launchpad code reviewers 2012-10-11 Pending
Review via email: mp+129248@code.launchpad.net

Commit message

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

To post a comment you must log in.
review: Approve
Andres Rodriguez (andreserl) wrote :

Approving myself.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-11 14:43:48 +0000
3+++ debian/changelog 2012-10-11 16:39:23 +0000
4@@ -13,6 +13,8 @@
5 to handle upgrades.
6 * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
7 * debian/control: Depends on maas-region-controller for maas-dns.
8+ * debian/maas-region-controller.postinst: Set the correct host for
9+ BROKER_URL (LP: #1065080)
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 11:17:21 -0400
12
13
14=== modified file 'debian/maas-region-controller.postinst'
15--- debian/maas-region-controller.postinst 2012-10-10 11:05:46 +0000
16+++ debian/maas-region-controller.postinst 2012-10-11 16:39:23 +0000
17@@ -89,7 +89,10 @@
18 local workers_user="maas_workers"
19 local workers_pass="$(pwgen -s 20)"
20 local workers_vhost="/maas_workers"
21- local amqp_host="localhost"
22+ local amqp_host=$1
23+ if [ -z "$amqp_host" ]; then
24+ amqp_host="localhost"
25+ fi
26 local amqp_port="5672"
27 if [ -x /usr/sbin/rabbitmqctl ]; then
28 if ! rabbitmqctl list_users | grep -qs "$workers_user"; then
29@@ -241,7 +244,7 @@
30 #########################################################
31
32 # Handle celery/rabbitmq publishing
33- configure_maas_workers_rabbitmq_user
34+ configure_maas_workers_rabbitmq_user "$ipaddr"
35
36 #########################################################
37 ######## add maas.conf to tgt conf.d ####################
38@@ -277,6 +280,7 @@
39 if [ -n "$ipaddr" ]; then
40 configure_maas_default_url "$ipaddr"
41 configure_maas_squid_deb_proxy "$ipaddr"
42+ configure_maas_workers_rabbitmq_user "$ipaddr"
43 fi
44
45 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
46@@ -297,7 +301,7 @@
47 restart_rabbitmq
48 configure_maas_txlongpoll_rabbitmq_user
49 # Handle celery/rabbitmq publishing
50- configure_maas_workers_rabbitmq_user
51+ configure_maas_workers_rabbitmq_user "$ipaddr"
52 # handle database upgrade
53 if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
54 # source dbconfig-common db config for maas-region-controller

Subscribers

People subscribed via source and target branches

to all changes: