← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/maas_celery_config into lp:maas

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas_celery_config into lp:maas.

Commit message:
setup.py: Install celeryconfig.py in appropriate location

Requested reviews:
  Andres Rodriguez (andreserl)
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas_celery_config/+merge/127061
-- 
https://code.launchpad.net/~andreserl/maas/maas_celery_config/+merge/127061
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/maas_celery_config into lp:maas.
=== modified file 'setup.py'
--- setup.py	2012-09-28 03:34:05 +0000
+++ setup.py	2012-09-28 20:36:21 +0000
@@ -57,7 +57,6 @@
             ['etc/pserv.yaml',
              'etc/maas_cluster.conf',
              'etc/txlongpoll.yaml',
-             'etc/celeryconfig.py',
              'contrib/maas_local_celeryconfig.py',
              'etc/maas/import_ephemerals',
              'etc/maas/import_pxe_files',
@@ -67,7 +66,8 @@
         ('/etc/cron.d',
             ['etc/cron.d/maas-gc']),
         ('/usr/share/maas',
-            ['contrib/wsgi.py']),
+            ['contrib/wsgi.py',
+             'etc/celeryconfig.py']),
         ('/usr/share/maas/preseeds',
             ['contrib/preseeds_v2/commissioning',
              'contrib/preseeds_v2/enlist',


Follow ups