launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/maas-provision-celery-config into lp:maas.

Commit message:
When calling maas-provision from the import scripts (now on the cluster controller), use the cluster celeryconfig not the region celeryconfig.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/maas-provision-celery-config/+merge/133107

Discussed with Raphaël.  This change silences a warning I got while testing the import scripts on the cluster controller, without a region controller installed.  When they called maas-provision, Celery complained that it couldn't find celeryconfig.py.  We use celeryconfig.py on the region controller, whereas the cluster controller uses cluster_celeryconfig.py.

As far as I'm aware, there should be no practical difference except fixing the warning output.  Both celery configs include the “common” celeryconfig.  The only setting that maas-provision will miss out on is BROKER_URL, but maas-provision doesn't actually communicate with the RabbitMQ broker.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/maas-provision-celery-config/+merge/133107
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/maas-provision-celery-config into lp:maas.

=== modified file 'scripts/maas-import-pxe-files'
--- scripts/maas-import-pxe-files	2012-11-02 10:46:44 +0000
+++ scripts/maas-import-pxe-files	2012-11-06 17:10:40 +0000
@@ -53,6 +53,9 @@
 # Default is yes.
 IMPORT_EPHEMERALS=${IMPORT_EPHEMERALS:-1}
 
+# The import script is meant to run on cluster controllers.  Use the celery
+# config appropriate to the cluster controller.
+CELERY_CONFIG_MODULE="celeryconfig_cluster"
 
 # Show script usage/summary.
 show_usage() {