From fe9b7552d116b150f178c4cc778fa27cd8d956d1 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 12 Jan 2017 14:55:26 -0700 Subject: [PATCH] Add openstack requirements to smoke suite Signed-off-by: Zack Cerza --- qa/suites/smoke/basic/clusters/+ | 0 qa/suites/smoke/basic/clusters/openstack.yaml | 8 ++++++++ qa/suites/smoke/systemd/clusters/+ | 0 qa/suites/smoke/systemd/clusters/fixed-4.yaml | 5 +++++ qa/suites/smoke/systemd/clusters/openstack.yaml | 8 ++++++++ qa/suites/smoke/systemd/tasks/systemd.yaml | 5 ----- 6 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 qa/suites/smoke/basic/clusters/+ create mode 100644 qa/suites/smoke/basic/clusters/openstack.yaml create mode 100644 qa/suites/smoke/systemd/clusters/+ create mode 100644 qa/suites/smoke/systemd/clusters/fixed-4.yaml create mode 100644 qa/suites/smoke/systemd/clusters/openstack.yaml diff --git a/qa/suites/smoke/basic/clusters/+ b/qa/suites/smoke/basic/clusters/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/smoke/basic/clusters/openstack.yaml b/qa/suites/smoke/basic/clusters/openstack.yaml new file mode 100644 index 000000000000..4d6edcd07b61 --- /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 000000000000..e69de29bb2d1 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 000000000000..8e5a98742057 --- /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 000000000000..4d6edcd07b61 --- /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 7b0f44226adc..67b6170839ab 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: -- 2.47.3