Merge lp:~andreserl/maas/maas_setup_data_files into lp:~maas-committers/maas/trunk

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 704
Proposed branch: lp:~andreserl/maas/maas_setup_data_files
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 32 lines (+22/-0)
1 file modified
setup.py (+22/-0)
To merge this branch: bzr merge lp:~andreserl/maas/maas_setup_data_files
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+112810@code.launchpad.net

Commit message

setup.py: Install data_files that are required by maas, rather than manually copy them on packaging

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

I haven't checked this myself, and I'd like to eventually compose some sort of test around this, but this looks good for now. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-06-21 12:55:22 +0000
3+++ setup.py 2012-06-29 16:42:18 +0000
4@@ -52,6 +52,28 @@
5 package_dir={'': b'src'},
6 include_package_data=True,
7
8+ data_files=[
9+ ('/etc/maas',
10+ ['etc/pserv.yaml',
11+ 'etc/txlongpoll.yaml',
12+ 'etc/celeryconfig.py',
13+ 'etc/maas/import_ephemerals',
14+ 'etc/maas/commissioning-user-data',
15+ 'contrib/maas-http.conf',
16+ 'contrib/maas_local_settings.py']),
17+ ('/etc/cron.d',
18+ ['etc/cron.d/maas-gc']),
19+ ('/usr/share/maas',
20+ ['contrib/wsgi.py']),
21+ ('/usr/share/maas/preseeds',
22+ ['contrib/preseeds_v2/commissioning',
23+ 'contrib/preseeds_v2/enlist',
24+ 'contrib/preseeds_v2/generic',
25+ 'contrib/preseeds_v2/preseed_master']),
26+ ('/usr/sbin',
27+ ['scripts/maas-import-ephemerals', 'scripts/maas-import-pxe-files']),
28+ ],
29+
30 install_requires=[
31 'setuptools',
32 'Django == 1.3.1',