openstack: package data files

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/setup.py b/setup.py
index 22b8a75459c6158bf1c0d6736701e8e8c66879a3..df6a83938777d1f0ef93d8f55d0524e245f7662f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,22 @@ setup(
     packages=find_packages(),
     package_data={
      'teuthology.task': ['valgrind.supp', 'adjust-ulimits', 'edit_sudoers.sh', 'daemon-helper'],
-     'teuthology': ['ceph.conf.template'],
+     'teuthology.task': ['valgrind.supp', 'adjust-ulimits', 'edit_sudoers.sh', 'daemon-helper'],
+     'teuthology.openstack': [
+         'archive-key',
+         'archive-key.pub',
+         'openstack-centos-6.5-user-data.txt',
+         'openstack-centos-7.0-user-data.txt',
+         'openstack-debian-8.0-user-data.txt',
+         'openstack-opensuse-user-data.txt',
+         'openstack-teuthology.cron',
+         'openstack-teuthology.init',
+         'openstack-ubuntu-12.04-user-data.txt',
+         'openstack-ubuntu-14.04-user-data.txt',
+         'openstack-user-data.txt',
+         'openstack.yaml',
+         'setup-openstack.sh'
+     ],
     },
     author='Inktank Storage, Inc.',
     author_email='ceph-qa@ceph.com',

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 4fcb8d77b65a053aa0d8e9ed2a04a9fcd512f9f1..15600f5bc3a07b764bc29aac03f4fe1c65c565ce 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -483,7 +483,7 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
             else:
                 argv.append(original_argv.pop(0))
         argv.append('/home/' + self.username +
-                    '/teuthology/teuthology/openstack/test/openstack.yaml')
+                    '/teuthology/teuthology/openstack/openstack.yaml')
         command = (
             "source ~/.bashrc_teuthology ; " + self.teuthology_suite + " " +
             " --machine-type openstack " +

diff --git a/teuthology/openstack/openstack.yaml b/teuthology/openstack/openstack.yaml
new file mode 100644 (file)
index 0000000..8b11997
--- /dev/null
+++ b/teuthology/openstack/openstack.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        osd heartbeat grace: 100
+        # this line to address issue #1017
+        mon lease: 15
+        mon lease ack timeout: 25
+  rgw:
+    default_idle_timeout: 1200
+  s3tests:
+    idle_timeout: 1200
+archive-on-error: true

diff --git a/teuthology/openstack/test/openstack.yaml b/teuthology/openstack/test/openstack.yaml
deleted file mode 100644 (file)
index 8b11997..0000000
--- a/teuthology/openstack/test/openstack.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        osd heartbeat grace: 100
-        # this line to address issue #1017
-        mon lease: 15
-        mon lease ack timeout: 25
-  rgw:
-    default_idle_timeout: 1200
-  s3tests:
-    idle_timeout: 1200
-archive-on-error: true