Merge lp:~soren/nova/more-thorough-setup.py-install into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Make "setup.py install" much more thorough. It now installs tools/ into /usr/share/nova and makes sure api-paste.conf lands in /etc/nova rather than /etc.

[Jay Pipes (jaypipes)]

29 + return package_data

need one more newline after that.

Also, in the commit description you wrote: "It now installs tools/ into /usr/share/nova, CA/ into /usr/lib/python2.X/nova, and makes sure api-paste.conf lands in /etc/nova rather than /etc."

I see how this patch installs tools/ into /usr/share/nova, but I don't see where the other two things are done...could you explain, since I don't see anything in the commit that changes the CA or etc stuff...

review: Needs Information

[Soren Hansen (soren)]

2011/4/5 Jay Pipes <email address hidden>:
> Review: Needs Information
> 29      + return package_data
>
> need one more newline after that.

What, really? pep8 is dead silent to me?

> Also, in the commit description you wrote: "It now installs tools/ into /usr/share/nova, CA/ into /usr/lib/python2.X/nova, and makes sure api-paste.conf lands in /etc/nova rather than /etc."

Sorry, the CA stuff is wrong. That part was accomplished in the CA
separation branch. The api-paste thing is this:

> === added directory 'etc/nova'
> === renamed file 'etc/api-paste.ini' => 'etc/nova/api-paste.ini'

> I see how this patch installs tools/ into /usr/share/nova, but I don't see where the other two things are done...could you explain, since I don't see anything in the commit that changes the CA or etc stuff...

I'll remove the CA stuff. Sorry about the confusion.

--
Soren Hansen        | http://linux2go.dk/
Ubuntu Developer    | http://www.ubuntu.com/
OpenStack Developer | http://www.openstack.org/

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~soren/nova/more-thorough-setup.py-install into lp:nova failed. Below is the output from the failed tests.

AccountsTest
    test_account_create OK
    test_account_delete OK
    test_account_update OK
    test_get_account OK
AdminAPITest
    test_admin_disabled OK
    test_admin_enabled OK
APITest
    test_exceptions_are_converted_to_faults OK
Test
    test_authorize_token OK
    test_authorize_user OK
    test_bad_token OK
    test_bad_user_bad_key OK
    test_bad_user_good_key OK
    test_no_user OK
    test_token_expiry OK
TestFunctional
    test_token_doesnotexist OK
    test_token_expiry OK
TestLimiter
    test_authorize_token OK
LimiterTest
    test_limiter_custom_max_limit OK
    test_limiter_limit_and_offset OK
    test_limiter_limit_medium OK
    test_limiter_limit_over_max OK
    test_limiter_limit_zero OK
    test_limiter_negative_limit OK
    test_limiter_negative_offset OK
    test_limiter_nothing OK
    test_limiter_offset_bad OK
    test_limiter_offset_blank OK
    test_limiter_offset_medium OK
    test_limiter_offset_over_max OK
    test_limiter_offset_zero OK
ActionExtensionTest
    test_extended_action OK
    test_invalid_action OK
    test_invalid_action_body OK
ExtensionControllerTest
    test_get_by_alias OK
    test_index OK
ExtensionManagerTest
    test_get_resources OK
ResourceExtensionTest
    test_get_resources OK
    test_get_resources_with_controller OK
    test_no_extension_present OK
ResponseExtensionTest
    test_get_resources_with_mgr OK
    test_get_resources_with_stub_mgr OK
TestFaults
    test_400_fault_json OK
    test_400_fault_xml ...

[Soren Hansen (soren)]

Apologies, forgot to push a last revision.

[OpenStack Infra (hudson-openstack)]

No proposals found for merge of lp:~soren/nova/ca-separate-code-and-state into lp:nova.

=== added directory 'etc/nova'
=== renamed file 'etc/api-paste.ini' => 'etc/nova/api-paste.ini'
=== modified file 'nova/wsgi.py'
--- nova/wsgi.py	2011-03-16 03:13:05 +0000
+++ nova/wsgi.py	2011-04-06 06:42:16 +0000
@@ -532,6 +532,7 @@
     """
 
     configfiles = [basename,
+                   os.path.join(FLAGS.state_path, 'etc', 'nova', basename),
                    os.path.join(FLAGS.state_path, 'etc', basename),
                    os.path.join(FLAGS.state_path, basename),
                    '/etc/nova/%s' % basename]

=== modified file 'setup.py'
--- setup.py	2011-03-29 22:34:25 +0000
+++ setup.py	2011-04-06 06:42:16 +0000
@@ -16,6 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import glob
 import os
 import subprocess
 import sys
@@ -86,6 +87,19 @@
 except:
     pass
 
+
+def find_data_files(destdir, srcdir):
+    package_data = []
+    files = []
+    for d in glob.glob('%s/*' % (srcdir, )):
+        if os.path.isdir(d):
+            package_data += find_data_files(
+                                 os.path.join(destdir, os.path.basename(d)), d)
+        else:
+            files += [d]
+    package_data += [(destdir, files)]
+    return package_data
+
 DistUtilsExtra.auto.setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
@@ -96,6 +110,7 @@
       packages=find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
+      data_files=find_data_files('share/nova', 'tools'),
       scripts=['bin/nova-ajax-console-proxy',
                'bin/nova-api',
                'bin/nova-compute',