launchpad-reviewers team mailing list archive

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

Raphaël Badin has proposed merging lp:~rvb/maas/split-custom-config into lp:maas.

Commit message:
Put the local cluster celery config in a file named maas_local_celeryconfig_cluster.py.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/split-custom-config/+merge/127112

Put the local cluster celery config in a file named maas_local_celeryconfig_cluster.py.
-- 
https://code.launchpad.net/~rvb/maas/split-custom-config/+merge/127112
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/split-custom-config into lp:maas.

=== modified file 'contrib/maas_local_celeryconfig.py'
--- contrib/maas_local_celeryconfig.py	2012-09-27 09:19:24 +0000
+++ contrib/maas_local_celeryconfig.py	2012-09-29 17:38:21 +0000
@@ -1,6 +1,3 @@
 # Broker connection information.
 # Format: transport://userid:password@hostname:port/virtual_host
 BROKER_URL = ''
-
-# UUID identifying the running cluster controller.
-CLUSTER_UUID = None

=== added file 'contrib/maas_local_celeryconfig_cluster.py'
--- contrib/maas_local_celeryconfig_cluster.py	1970-01-01 00:00:00 +0000
+++ contrib/maas_local_celeryconfig_cluster.py	2012-09-29 17:38:21 +0000
@@ -0,0 +1,2 @@
+# UUID identifying the running cluster controller.
+CLUSTER_UUID = None

=== modified file 'etc/celeryconfig_cluster.py'
--- etc/celeryconfig_cluster.py	2012-09-28 15:31:48 +0000
+++ etc/celeryconfig_cluster.py	2012-09-29 17:38:21 +0000
@@ -27,11 +27,11 @@
 import_settings(celeryconfig_common)
 
 try:
-    import maas_local_celeryconfig
+    import maas_local_celeryconfig_cluster
 except ImportError:
     pass
 else:
-    import_settings(maas_local_celeryconfig)
+    import_settings(maas_local_celeryconfig_cluster)
 
 
 CELERYBEAT_SCHEDULE = {

=== modified file 'setup.py'
--- setup.py	2012-09-28 23:08:20 +0000
+++ setup.py	2012-09-29 17:38:21 +0000
@@ -58,6 +58,7 @@
              'etc/maas_cluster.conf',
              'etc/txlongpoll.yaml',
              'contrib/maas_local_celeryconfig.py',
+             'contrib/maas_local_celeryconfig_cluster.py',
              'etc/maas/import_ephemerals',
              'etc/maas/import_pxe_files',
              'etc/maas/commissioning-user-data',