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

Proposed by Andres Rodriguez on 2014-08-21
Status: Merged
Approved by: Andres Rodriguez on 2014-08-21
Approved revision: 293
Merged at revision: 293
Proposed branch: lp:~andreserl/maas/packaging.trusty-restart-cluster
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 29 lines (+8/-0)
2 files modified
debian/changelog (+4/-0)
debian/maas-region-controller.postinst (+4/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.trusty-restart-cluster
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2014-08-21
Review via email: mp+231735@code.launchpad.net

Commit message

Ensure we start cluster-celery if it is installed alongside the region.

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

self approve!

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-08-21 08:39:39 +0000
3+++ debian/changelog 2014-08-21 13:50:11 +0000
4@@ -9,6 +9,10 @@
5 cluster celery restarting.
6 * debian/rules: Pull upstream branch from the right place.
7
8+ [ Andres Rodriguez ]
9+ * debian/maas-region-controller.postinst: Ensure cluster celery is
10+ started if it also runs on the region.
11+
12 -- Julian Edwards <julian.edwards@canonical.com> Thu, 21 Aug 2014 18:38:27 +1000
13
14 maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium
15
16=== modified file 'debian/maas-region-controller.postinst'
17--- debian/maas-region-controller.postinst 2014-08-21 08:39:39 +0000
18+++ debian/maas-region-controller.postinst 2014-08-21 13:50:11 +0000
19@@ -301,6 +301,10 @@
20 invoke-rc.d maas-txlongpoll restart || true
21 invoke-rc.d maas-region-celery restart || true
22
23+if [ -f /etc/init/maas-cluster-celery.conf ]; then
24+ invoke-rc.d maas-cluster-celery start || true
25+fi
26+
27 db_stop
28
29 #DEBHELPER#

Subscribers

People subscribed via source and target branches