MAAS

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

  1. fix_lp1298559_2
  2. Merge into packaging.trusty
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 268
Merged at revision: 268
Proposed branch: lp:~andreserl/maas/fix_lp1298559_2
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 41 lines (+7/-3)
3 files modified
debian/changelog (+5/-1)
debian/maas-region-controller-min.maas-region-celery.upstart (+1/-1)
debian/maas-region-controller-min.maas-txlongpoll.upstart (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/fix_lp1298559_2
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+214987@code.launchpad.net

Commit message

debian/maas-region-controller-min.maas-region-celery.upstart,
  debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO
  install by making sure rabbitmq user is really created if it does not
  exist (LP: #1298559)

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

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 2014-04-07 14:27:02 +0000
3+++ debian/changelog 2014-04-09 16:12:42 +0000
4@@ -1,6 +1,10 @@
5 maas (1.5+bzr2227-0ubuntu2) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ * New upstream bugfix release:
9+ * debian/maas-region-controller-min.maas-region-celery.upstart,
10+ debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO
11+ install by making sure rabbitmq user is really created if it does not
12+ exist (LP: #1298559)
13
14 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 07 Apr 2014 10:26:51 -0400
15
16
17=== modified file 'debian/maas-region-controller-min.maas-region-celery.upstart'
18--- debian/maas-region-controller-min.maas-region-celery.upstart 2014-03-14 15:03:41 +0000
19+++ debian/maas-region-controller-min.maas-region-celery.upstart 2014-04-09 16:12:42 +0000
20@@ -16,7 +16,7 @@
21 env DJANGO_SETTINGS_MODULE="maas.settings"
22
23 pre-start script
24- if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1 ]; then
25+ if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1; then
26 workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
27 /usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
28 /usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
29
30=== modified file 'debian/maas-region-controller-min.maas-txlongpoll.upstart'
31--- debian/maas-region-controller-min.maas-txlongpoll.upstart 2014-03-14 15:03:41 +0000
32+++ debian/maas-region-controller-min.maas-txlongpoll.upstart 2014-04-09 16:12:42 +0000
33@@ -15,7 +15,7 @@
34 env longpoll_vhost="/maas_longpoll"
35
36 pre-start script
37- if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1 ]; then
38+ if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1; then
39 longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
40 /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
41 /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"

Subscribers

People subscribed via source and target branches