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

[Andres Rodriguez]

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)

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-07 14:27:02 +0000
+++ debian/changelog	2014-04-09 16:11:57 +0000
@@ -1,6 +1,10 @@
 maas (1.5+bzr2227-0ubuntu2) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream bugfix release:
+  * 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)
 
  -- Andres Rodriguez <[e-mail]>  Mon, 07 Apr 2014 10:26:51 -0400
 
 
=== modified file 'debian/maas-region-controller-min.maas-region-celery.upstart'
--- debian/maas-region-controller-min.maas-region-celery.upstart	2014-03-14 15:03:41 +0000
+++ debian/maas-region-controller-min.maas-region-celery.upstart	2014-04-09 16:11:57 +0000
@@ -16,7 +16,7 @@
 env DJANGO_SETTINGS_MODULE="maas.settings"
 
 pre-start script
-	if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1 ]; then
+	if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1; then
 		workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
 		/usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
 		/usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
 
=== modified file 'debian/maas-region-controller-min.maas-txlongpoll.upstart'
--- debian/maas-region-controller-min.maas-txlongpoll.upstart	2014-03-14 15:03:41 +0000
+++ debian/maas-region-controller-min.maas-txlongpoll.upstart	2014-04-09 16:11:57 +0000
@@ -15,7 +15,7 @@
 env longpoll_vhost="/maas_longpoll"
 
 pre-start script
-	if [ -f /usr/sbin/rabbitmqctl ] && [ ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1 ]; then
+	if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1; then
 		longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
 		/usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
 		/usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"