OpenStack Compute (nova)

Merge lp:~ttx/nova/bexar-lp714678 into lp:nova/bexar

  1. bexar-lp714678
  2. Merge into bexar
Proposed by Thierry Carrez
Status: Merged
Approved by: Soren Hansen
Approved revision: 646
Merged at revision: 646
Proposed branch: lp:~ttx/nova/bexar-lp714678
Merge into: lp:nova/bexar
Diff against target: 61 lines (+16/-1)
2 files modified
MANIFEST.in (+10/-0)
setup.py (+6/-1)
To merge this branch: bzr merge lp:~ttx/nova/bexar-lp714678
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve
Jay Pipes (community) Approve
OpenStack Infra Pending
Review via email: mp+49999@code.launchpad.net

Commit message

Fixes tarball contents by adding missing scripts and files to setup.py / MANIFEST.in

Description of the change

Backport of the Cactus fix:

Some binaries, files and directories were added to nova without updating MANIFEST.in or setup.py. Therefore the tarballs we build and release are not matching the contents of the branch.

This branch addresses the gap in Cactus, by adding missing binaries to setup.py and missing files and directories to MANIFEST.in.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm

review: Approve
Revision history for this message
Soren Hansen (soren) wrote :

alright

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2011-01-19 23:46:20 +0000
3+++ MANIFEST.in 2011-02-16 16:17:23 +0000
4@@ -6,14 +6,23 @@
5 graft smoketests
6 graft tools
7 graft etc
8+graft bzrplugins
9+graft contrib
10+graft po
11+graft plugins
12 include nova/api/openstack/notes.txt
13+include nova/auth/*.schema
14 include nova/auth/novarc.template
15+include nova/auth/opendj.sh
16 include nova/auth/slap.sh
17 include nova/cloudpipe/bootscript.sh
18 include nova/cloudpipe/client.ovpn.template
19+include nova/cloudpipe/bootscript.template
20 include nova/compute/fakevirtinstance.xml
21 include nova/compute/interfaces.template
22+include nova/console/xvp.conf.template
23 include nova/db/sqlalchemy/migrate_repo/migrate.cfg
24+include nova/db/sqlalchemy/migrate_repo/README
25 include nova/virt/interfaces.template
26 include nova/virt/libvirt*.xml.template
27 include nova/tests/CA/
28@@ -25,6 +34,7 @@
29 include nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml
30 include nova/tests/bundle/1mb.part.0
31 include nova/tests/bundle/1mb.part.1
32+include nova/tests/db/nova.austin.sqlite
33 include plugins/xenapi/README
34 include plugins/xenapi/etc/xapi.d/plugins/objectstore
35 include plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
36
37=== modified file 'setup.py'
38--- setup.py 2011-01-28 07:53:46 +0000
39+++ setup.py 2011-02-16 16:17:23 +0000
40@@ -85,9 +85,13 @@
41 packages=find_packages(exclude=['bin', 'smoketests']),
42 include_package_data=True,
43 test_suite='nose.collector',
44- scripts=['bin/nova-api',
45+ scripts=['bin/nova-ajax-console-proxy',
46+ 'bin/nova-api',
47+ 'bin/nova-combined',
48 'bin/nova-compute',
49+ 'bin/nova-console',
50 'bin/nova-dhcpbridge',
51+ 'bin/nova-direct-api',
52 'bin/nova-import-canonical-imagestore',
53 'bin/nova-instancemonitor',
54 'bin/nova-logspool',
55@@ -96,5 +100,6 @@
56 'bin/nova-objectstore',
57 'bin/nova-scheduler',
58 'bin/nova-spoolsentry',
59+ 'bin/stack',
60 'bin/nova-volume',
61 'tools/nova-debug'])

Subscribers

People subscribed via source and target branches