MAAS

Merge lp:~lutostag/maas/packaging+fix1300507 into lp:~maas-maintainers/maas/packaging

  1. packaging+fix1300507
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 294
Proposed branch: lp:~lutostag/maas/packaging+fix1300507
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 16 lines (+4/-2)
1 file modified
debian/maas-region-controller.postinst (+4/-2)
To merge this branch: bzr merge lp:~lutostag/maas/packaging+fix1300507
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+230905@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-region-controller.postinst'
2--- debian/maas-region-controller.postinst 2014-08-01 09:15:05 +0000
3+++ debian/maas-region-controller.postinst 2014-08-14 22:34:35 +0000
4@@ -293,8 +293,10 @@
5 # make sure rabbitmq is running
6 restart_rabbitmq
7 configure_maas_txlongpoll_rabbitmq_user
8- # Handle celery/rabbitmq publishing
9- configure_maas_workers_rabbitmq_user "$ipaddr"
10+ if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
11+ # Handle celery/rabbitmq publishing
12+ configure_maas_workers_rabbitmq_user "$ipaddr"
13+ fi
14 # handle database upgrade
15 if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
16 # source dbconfig-common db config for maas-region-controller

Subscribers

People subscribed via source and target branches