launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

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

Commit message:
Define CELERY_CONFIG_MODULE in maas-cluster-controller.maas-cluster-celery.upstart using 'env'.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/packaging.upstart-env/+merge/127286

No need to use 'export' in maas-cluster-controller.maas-cluster-celery.upstart to define CELERY_CONFIG_MODULE, 'env' should be enough (see http://upstart.ubuntu.com/cookbook/#export for details.)

= Pre-imp =

This was discussed and tested with Julian.
-- 
https://code.launchpad.net/~rvb/maas/packaging.upstart-env/+merge/127286
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/packaging.upstart-env into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-01 11:27:01 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-01 14:07:48 +0000
@@ -11,6 +11,8 @@
 setgid maas
 
 env CONFIG_FILE=/etc/maas/maas_cluster.conf
+# Use cluster config.
+env CELERY_CONFIG_MODULE="celeryconfig_cluster"
 
 pre-start script
     if [ ! -f $CONFIG_FILE ]; then
@@ -22,6 +24,5 @@
 
 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