← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/packaging-master-django into lp:~maas-maintainers/maas/packaging

 

Raphaël Badin has proposed merging lp:~rvb/maas/packaging-master-django into lp:~maas-maintainers/maas/packaging.

Commit message:
Make DJANGO_SETTINGS_MODULE available to the celery master running so that master tasks can use maasserver's methods.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/packaging-master-django/+merge/190614
-- 
https://code.launchpad.net/~rvb/maas/packaging-master-django/+merge/190614
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/packaging-master-django into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/maas-region-controller.maas-region-celery.upstart'
--- debian/maas-region-controller.maas-region-celery.upstart	2012-10-16 14:30:48 +0000
+++ debian/maas-region-controller.maas-region-celery.upstart	2013-10-11 11:12:54 +0000
@@ -13,6 +13,7 @@
 env workers_user="maas_workers"
 env workers_pass=""
 env workers_vhost="/maas_workers"
+env DJANGO_SETTINGS_MODULE="maas.settings"
 
 pre-start script
 	if ! /usr/sbin/rabbitmqctl list_user_permissions $workers_user 1>/dev/null 2>&1; then