From: Zack Cerza <zack@redhat.com>
Date: Thu, 12 Jan 2017 21:55:26 +0000 (-0700)
Subject: Add openstack requirements to smoke suite
X-Git-Tag: v11.2.1~222^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13283%2Fhead;p=ceph.git

Add openstack requirements to smoke suite

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit fe9b7552d116b150f178c4cc778fa27cd8d956d1)
---

diff --git a/qa/suites/smoke/basic/clusters/+ b/qa/suites/smoke/basic/clusters/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/smoke/basic/clusters/openstack.yaml b/qa/suites/smoke/basic/clusters/openstack.yaml
new file mode 100644
index 00000000000..4d6edcd07b6
--- /dev/null
+++ b/qa/suites/smoke/basic/clusters/openstack.yaml
@@ -0,0 +1,8 @@
+openstack:
+  - machine:
+      disk: 40 # GB
+      ram: 8000 # MB
+      cpus: 1
+    volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
diff --git a/qa/suites/smoke/systemd/clusters/+ b/qa/suites/smoke/systemd/clusters/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/smoke/systemd/clusters/fixed-4.yaml b/qa/suites/smoke/systemd/clusters/fixed-4.yaml
new file mode 100644
index 00000000000..8e5a9874205
--- /dev/null
+++ b/qa/suites/smoke/systemd/clusters/fixed-4.yaml
@@ -0,0 +1,5 @@
+roles:
+- [mon.a, osd.0]
+- [osd.1, osd.2]
+- [mds.a, osd.3]
+- [mon.b, client.0]
diff --git a/qa/suites/smoke/systemd/clusters/openstack.yaml b/qa/suites/smoke/systemd/clusters/openstack.yaml
new file mode 100644
index 00000000000..4d6edcd07b6
--- /dev/null
+++ b/qa/suites/smoke/systemd/clusters/openstack.yaml
@@ -0,0 +1,8 @@
+openstack:
+  - machine:
+      disk: 40 # GB
+      ram: 8000 # MB
+      cpus: 1
+    volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
diff --git a/qa/suites/smoke/systemd/tasks/systemd.yaml b/qa/suites/smoke/systemd/tasks/systemd.yaml
index 7b0f44226ad..67b6170839a 100644
--- a/qa/suites/smoke/systemd/tasks/systemd.yaml
+++ b/qa/suites/smoke/systemd/tasks/systemd.yaml
@@ -1,8 +1,3 @@
-roles:
-- [mon.a, osd.0]
-- [osd.1, osd.2]
-- [mds.a, osd.3]
-- [mon.b, client.0]
 tasks:
 - ssh-keys:
 - ceph-deploy: