Raphaël Badin has proposed merging lp:~rvb/maas/add-maas-cluster-packaging into
lp:~maas-maintainers/maas/packaging with
lp:~julian-edwards/maas/add-maas-cluster-packaging as a prerequisite.
Commit message:
This branch performs the packaging changes required by the upsteam changes in
https://code.launchpad.net/~rvb/maas/refactor-celerysettings/+merge/126816.
More precisely, now that we have two different celery config files (one for the
cluster controller and one for the region controller), the new config file and
the common file need to be linked and the cluster controller needs to use the
config file named celeryconfig_cluster.py as its Celery configuration.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~rvb/maas/add-maas-cluster-packaging/+merge/127002
= Notes =
Note that this branch is based on
lp:~julian-edwards/maas/add-maas-cluster-packaging which is not yet landed. It
will also require ~rvb/maas/refactor-celerysettings to be landed upstream.
I'm not really sure why we've got "etc/maas/maas_local_settings.py
usr/share/maas/maas_local_settings.py" in debian/maas-region-controller.links
while it's already in debian/maas-common.links. So I removed that line… maybe
I'm missing something.
--
https://code.launchpad.net/~rvb/maas/add-maas-cluster-packaging/+merge/127002
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~rvb/maas/add-maas-cluster-packaging into
lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-25 23:18:02 +0000
+++ debian/changelog 2012-09-28 15:48:31 +0000
@@ -37,6 +37,11 @@
instead of isc-dhcp-server (LP: #1055951)
[ Raphael Badin ]
+ * debian/maas-cluster-controller.links: Add link to
+ celeryconfig_cluster.py.
+ * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster"
+ as the Celery config module.
+ * debian/maas-common.links: Add link to celeryconfig_common.py.
* Install maas_local_celeryconfig.py in /etc/maas and symlink to
/usr/share/maas.
* debian/maas.postinst: Create rabbitmq celery user/vhost.
=== added file 'debian/maas-cluster-controller.links'
--- debian/maas-cluster-controller.links 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.links 2012-09-28 15:48:31 +0000
@@ -0,0 +1,1 @@
+etc/maas/celeryconfig_cluster.py usr/share/maas/celeryconfig_cluster.py
=== modified file 'debian/maas-cluster-controller.maas-celery.upstart'
--- debian/maas-cluster-controller.maas-celery.upstart 2012-09-28 15:48:31 +0000
+++ debian/maas-cluster-controller.maas-celery.upstart 2012-09-28 15:48:31 +0000
@@ -20,5 +20,6 @@
script
. $CONFIG_FILE # sets MAAS_URL
+ export CELERY_CONFIG_MODULE="celeryconfig_cluster" # use cluster config.
exec /usr/sbin/maas-provision start-cluster-controller $MAAS_URL
end script
=== modified file 'debian/maas-common.links'
--- debian/maas-common.links 2012-09-28 15:48:31 +0000
+++ debian/maas-common.links 2012-09-28 15:48:31 +0000
@@ -1,2 +1,2 @@
etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py
-etc/maas/celeryconfig.py usr/share/maas/celeryconfig.py
+etc/maas/celeryconfig_common.py usr/share/maas/celeryconfig_common.py
=== modified file 'debian/maas-region-controller.links'
--- debian/maas-region-controller.links 2012-09-28 15:48:31 +0000
+++ debian/maas-region-controller.links 2012-09-28 15:48:31 +0000
@@ -1,1 +1,1 @@
-etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
+etc/maas/celeryconfig.py usr/share/maas/celeryconfig.py
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
