From 7285694cb83ed618bea0d8c9170b725dd5566a27 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 14:53:56 +0200
Subject: [PATCH 1/4] Add a find_data_files method to setup.py. Use it to get
 tools/ installed under /usr/(local/)/share/nova

---
 setup.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/setup.py b/setup.py
index 20f4c1947ba4..6c45109bc28a 100644
--- a/setup.py
+++ b/setup.py
@@ -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 @@ try:
 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 @@ DistUtilsExtra.auto.setup(name='nova',
       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',

From 669c0214ec77127ca7efe4d1e347ccaf2c2ae8b0 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 14:54:11 +0200
Subject: [PATCH 2/4] Move api-paste.ini into a nova/ subdir of etc/

---
 etc/{ => nova}/api-paste.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename etc/{ => nova}/api-paste.ini (100%)

diff --git a/etc/api-paste.ini b/etc/nova/api-paste.ini
similarity index 100%
rename from etc/api-paste.ini
rename to etc/nova/api-paste.ini

From 6c8c454826263b334eb674c9ab1c8d62e5fd491f Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 14:55:19 +0200
Subject: [PATCH 4/4] Help paste_config_file find the api config now that we
 moved it.

---
 nova/wsgi.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/wsgi.py b/nova/wsgi.py
index ba08194665b3..05e7d5924e0f 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -532,6 +532,7 @@ def paste_config_file(basename):
     """
 
     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]