openstack: define the resources required to run a rados suite

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

diff --git a/suites/rados/basic/clusters/+ b/suites/rados/basic/clusters/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/basic/clusters/openstack.yaml b/suites/rados/basic/clusters/openstack.yaml
new file mode 100644 (file)
index 0000000..e4d8423
--- /dev/null
+++ b/suites/rados/basic/clusters/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB

diff --git a/suites/rados/monthrash/clusters/3-mons.yaml b/suites/rados/monthrash/clusters/3-mons.yaml
index b36db6592bd3dcf63c8585213d56788543f0b2bb..b3a2caf7212e2bccc60ea525ccb61016a7c85695 100644 (file)
--- a/suites/rados/monthrash/clusters/3-mons.yaml
+++ b/suites/rados/monthrash/clusters/3-mons.yaml
@@ -1,3 +1,7 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
 - [mon.b, osd.3, osd.4, osd.5, client.0]
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB

diff --git a/suites/rados/monthrash/clusters/9-mons.yaml b/suites/rados/monthrash/clusters/9-mons.yaml
index fdb87c6b324ae45b0850f9fce3ec83742cbbd89b..54332118434377edf3964179cf9526eff440cef8 100644 (file)
--- a/suites/rados/monthrash/clusters/9-mons.yaml
+++ b/suites/rados/monthrash/clusters/9-mons.yaml
@@ -1,3 +1,7 @@
 roles:
 - [mon.a, mon.b, mon.c, mon.d, mon.e, osd.0, osd.1, osd.2]
 - [mon.f, mon.g, mon.h, mon.i, osd.3, osd.4, osd.5, client.0]
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB

diff --git a/suites/rados/objectstore/alloc-hint.yaml b/suites/rados/objectstore/alloc-hint.yaml
index 8f8d4841eb07653c8ce7466f55d0e99d70f330fd..cc608663c546690556ac9a6b3a34967803e44fbd 100644 (file)
--- a/suites/rados/objectstore/alloc-hint.yaml
+++ b/suites/rados/objectstore/alloc-hint.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.a, osd.0, osd.1, osd.2, client.0]
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 
 overrides:
   ceph:
@@ -15,11 +19,3 @@ tasks:
     clients:
       all:
         - rados/test_alloc_hint.sh
-openstack:
-  - machine:
-      disk: 40 # GB
-      ram: 8000 # MB
-      cpus: 1
-    volumes: # attached to each instance
-      count: 3
-      size: 10 # GB

diff --git a/suites/rados/singleton-nomsgr/all/11429.yaml b/suites/rados/singleton-nomsgr/all/11429.yaml
index 1ec200163520396a7c3284cd73f8dd86411af312..3fbc6e86b1da239759318acde0805a2405367568 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -31,6 +31,10 @@ roles:
   - mon.c
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
     branch: v0.80.8

diff --git a/suites/rados/singleton-nomsgr/all/13234.yaml b/suites/rados/singleton-nomsgr/all/13234.yaml
index 44e70584481d2816986336dec335efed70ccb0c4..a4d7829cbc57c71eb2460928140363961c0b3955 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/13234.yaml
+++ b/suites/rados/singleton-nomsgr/all/13234.yaml
@@ -31,6 +31,10 @@ roles:
   - mon.c
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
     tag: v0.67.10

diff --git a/suites/rados/singleton/all/admin-socket.yaml b/suites/rados/singleton/all/admin-socket.yaml
index 0dbf9b219b290e1b79a682dbf1627777114583a6..4817267301453cde8def2d15d05252b74abf2cb1 100644 (file)
--- a/suites/rados/singleton/all/admin-socket.yaml
+++ b/suites/rados/singleton/all/admin-socket.yaml
@@ -3,6 +3,10 @@ roles:
   - osd.0
   - osd.1
   - client.a
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/cephtool.yaml b/suites/rados/singleton/all/cephtool.yaml
index 114073baa4e77350c27c108a1571fba34a33b46f..b0a886339a88952e5970ad08dac463af8f99916f 100644 (file)
--- a/suites/rados/singleton/all/cephtool.yaml
+++ b/suites/rados/singleton/all/cephtool.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/divergent_priors.yaml b/suites/rados/singleton/all/divergent_priors.yaml
index a01dd122a1933b93eab98109c2ce1c605b3d85a6..3103703edf4ecc2dc1ef0ef5f58b6ac595e138ff 100644 (file)
--- a/suites/rados/singleton/all/divergent_priors.yaml
+++ b/suites/rados/singleton/all/divergent_priors.yaml
@@ -4,6 +4,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 
 overrides:
   ceph:

diff --git a/suites/rados/singleton/all/divergent_priors2.yaml b/suites/rados/singleton/all/divergent_priors2.yaml
index aecbc0a401142f7f9950a2dac2c83751fc53f145..dd00b87003abec5dbd724bfacb1b34280e6a4720 100644 (file)
--- a/suites/rados/singleton/all/divergent_priors2.yaml
+++ b/suites/rados/singleton/all/divergent_priors2.yaml
@@ -4,6 +4,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 
 overrides:
   ceph:

diff --git a/suites/rados/singleton/all/dump-stuck.yaml b/suites/rados/singleton/all/dump-stuck.yaml
index 2752a38fd4596adcc72bec1d37c66c2c0348a815..f153de6295468480cb6f2d3b77544fed5b2ad619 100644 (file)
--- a/suites/rados/singleton/all/dump-stuck.yaml
+++ b/suites/rados/singleton/all/dump-stuck.yaml
@@ -2,6 +2,10 @@ roles:
 - - mon.a
   - osd.0
   - osd.1
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml b/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
index c56db58542c472de21f0f521b605829a717b9fde..8c912729fdb3c6b0bfbd16ad64f950712f7c8638 100644 (file)
--- a/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
+++ b/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
 - - osd.3
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
     branch: infernalis

diff --git a/suites/rados/singleton/all/ec-lost-unfound.yaml b/suites/rados/singleton/all/ec-lost-unfound.yaml
index 7006d7f378312eca087d0bcbdc77b0bf68ffd872..7c4b5f0e03984b0f5ddc1c8a5311d76420354c8c 100644 (file)
--- a/suites/rados/singleton/all/ec-lost-unfound.yaml
+++ b/suites/rados/singleton/all/ec-lost-unfound.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
   - osd.3
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml b/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
index 6c53c8b3b491c159c1f6f71cf834d828f1026c4d..9bd9e19d3b59b7ff2764e4dd8a23286a742d48c0 100644 (file)
--- a/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
+++ b/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
 - - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
     branch: infernalis

diff --git a/suites/rados/singleton/all/lost-unfound-delete.yaml b/suites/rados/singleton/all/lost-unfound-delete.yaml
index e6e09d320d34cc0ffdf2542624207a64e9b8439d..fbc24e0d17e7c8b40430e7de91e748d6d188d271 100644 (file)
--- a/suites/rados/singleton/all/lost-unfound-delete.yaml
+++ b/suites/rados/singleton/all/lost-unfound-delete.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/lost-unfound-upgrade.yaml b/suites/rados/singleton/all/lost-unfound-upgrade.yaml
index 3d78bca2e6603b262c1430601c5f1d09ffdd9cbc..0a8dd69ffe8c4aa28f5383ab9959611cff151d73 100644 (file)
--- a/suites/rados/singleton/all/lost-unfound-upgrade.yaml
+++ b/suites/rados/singleton/all/lost-unfound-upgrade.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
 - - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
     branch: infernalis

diff --git a/suites/rados/singleton/all/lost-unfound.yaml b/suites/rados/singleton/all/lost-unfound.yaml
index 0597e43713c1660921a87202bbec7dfc85042d83..31649dbb0da82e92f5b5da2395e8ecc2cf17cc28 100644 (file)
--- a/suites/rados/singleton/all/lost-unfound.yaml
+++ b/suites/rados/singleton/all/lost-unfound.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/mon-config-keys.yaml b/suites/rados/singleton/all/mon-config-keys.yaml
index f81070fc770e246185417cd376b2a531850bee6a..b905691a9f4cae29f5a5d86431367a99b5f5ec47 100644 (file)
--- a/suites/rados/singleton/all/mon-config-keys.yaml
+++ b/suites/rados/singleton/all/mon-config-keys.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/mon-thrasher.yaml b/suites/rados/singleton/all/mon-thrasher.yaml
index e69198c85e50cf77b74a91be2309118a924b216f..5cadddabe6bec3000f00897a93136eaefc55994b 100644 (file)
--- a/suites/rados/singleton/all/mon-thrasher.yaml
+++ b/suites/rados/singleton/all/mon-thrasher.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/osd-backfill.yaml b/suites/rados/singleton/all/osd-backfill.yaml
index 781a63eaf6227d768e29a05b7f9a2bef5ceaaf08..c9263db00ec517d24a87b0292957c230f5515c84 100644 (file)
--- a/suites/rados/singleton/all/osd-backfill.yaml
+++ b/suites/rados/singleton/all/osd-backfill.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/suites/rados/singleton/all/osd-recovery-incomplete.yaml
index 123f4d44fbed0d916fc53cfd170708794ee29ff7..5983b7ae29dbc4595a3216af57edce0c91a2e436 100644 (file)
--- a/suites/rados/singleton/all/osd-recovery-incomplete.yaml
+++ b/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
   - osd.3
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/osd-recovery.yaml b/suites/rados/singleton/all/osd-recovery.yaml
index a6e1d99f6fec487e1356a15d755c37e58bf7bfaa..977fa630f2eb879f9bc32a2473e0f89a569bb5e7 100644 (file)
--- a/suites/rados/singleton/all/osd-recovery.yaml
+++ b/suites/rados/singleton/all/osd-recovery.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/peer.yaml b/suites/rados/singleton/all/peer.yaml
index 655ea685584c01be5d786514838e089daaec1623..9eaaa946e83b66262da7cdd4c79abee461b37566 100644 (file)
--- a/suites/rados/singleton/all/peer.yaml
+++ b/suites/rados/singleton/all/peer.yaml
@@ -5,6 +5,10 @@ roles:
   - osd.0
   - osd.1
   - osd.2
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/pg-removal-interruption.yaml b/suites/rados/singleton/all/pg-removal-interruption.yaml
index 1d6c320079758319ccec98e15765a0a2b8f7daf9..efb9fa18c5002ef974172b9f4c75952997613c35 100644 (file)
--- a/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -4,6 +4,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/radostool.yaml b/suites/rados/singleton/all/radostool.yaml
index 2fd5d30f9e1e66a869688e9f33ee178a3ac79442..0760ebd4bc478a69270bfa92eb1f1f63e7f1f2f8 100644 (file)
--- a/suites/rados/singleton/all/radostool.yaml
+++ b/suites/rados/singleton/all/radostool.yaml
@@ -3,6 +3,10 @@ roles:
   - osd.0
   - osd.1
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 2
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/reg11184.yaml b/suites/rados/singleton/all/reg11184.yaml
index 54361a4e3d59d9f7d9ba26209289569a01fde094..8bc502a14561a9f1591d4d1ba9288a867842fa04 100644 (file)
--- a/suites/rados/singleton/all/reg11184.yaml
+++ b/suites/rados/singleton/all/reg11184.yaml
@@ -4,6 +4,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 
 overrides:
   ceph:

diff --git a/suites/rados/singleton/all/rest-api.yaml b/suites/rados/singleton/all/rest-api.yaml
index 133840a5dc158c1746f89f41fad855d12c0ab0d9..ce39a6b2cd4f27a63d4d48b6ec7a3d0403f47ae8 100644 (file)
--- a/suites/rados/singleton/all/rest-api.yaml
+++ b/suites/rados/singleton/all/rest-api.yaml
@@ -7,6 +7,10 @@ roles:
   - osd.2
   - mds.a
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/thrash-rados.yaml b/suites/rados/singleton/all/thrash-rados.yaml
index 82c47bf3fe7aab113c4c629930b79375fd00a632..af963106a2a2a1f7dec28ff885fa13e131e0e72b 100644 (file)
--- a/suites/rados/singleton/all/thrash-rados.yaml
+++ b/suites/rados/singleton/all/thrash-rados.yaml
@@ -7,6 +7,10 @@ roles:
   - osd.4
   - osd.5
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml b/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml
index d36c0f84c957e88f905d437b037ba6ef816086c5..d1e401d1a2e3f6fb2a58f5024952a51889f72b2e 100644 (file)
--- a/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml
+++ b/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml
@@ -7,6 +7,10 @@ roles:
   - osd.4
   - osd.5
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/singleton/all/watch-notify-same-primary.yaml b/suites/rados/singleton/all/watch-notify-same-primary.yaml
index 3d2d683f63c1f2b5f87bfd0c9d93348c118ed3df..48900f392dfa0b6650267543c73fbc9a4372404c 100644 (file)
--- a/suites/rados/singleton/all/watch-notify-same-primary.yaml
+++ b/suites/rados/singleton/all/watch-notify-same-primary.yaml
@@ -6,6 +6,10 @@ roles:
   - osd.1
   - osd.2
   - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/thrash-erasure-code-big/cluster/+ b/suites/rados/thrash-erasure-code-big/cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/thrash-erasure-code-big/cluster/openstack.yaml b/suites/rados/thrash-erasure-code-big/cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..e4d8423
--- /dev/null
+++ b/suites/rados/thrash-erasure-code-big/cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB

diff --git a/suites/rados/thrash-erasure-code-shec/clusters/+ b/suites/rados/thrash-erasure-code-shec/clusters/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/thrash-erasure-code-shec/clusters/openstack.yaml b/suites/rados/thrash-erasure-code-shec/clusters/openstack.yaml
new file mode 100644 (file)
index 0000000..e559d91
--- /dev/null
+++ b/suites/rados/thrash-erasure-code-shec/clusters/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 10 # GB

diff --git a/suites/rados/thrash/clusters/openstack.yaml b/suites/rados/thrash/clusters/openstack.yaml
index 39e43d021ac5d367f034f71c3e6fea365063038e..f4d1349b48262fa81a7afbf05beda5bc314608b5 100644 (file)
--- a/suites/rados/thrash/clusters/openstack.yaml
+++ b/suites/rados/thrash/clusters/openstack.yaml
@@ -1,8 +1,4 @@
 openstack:
-  - machine:
-      disk: 40 # GB
-      ram: 8000 # MB
-      cpus: 1
-    volumes: # attached to each instance
+  - volumes: # attached to each instance
       count: 3
       size: 30 # GB

diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/+ b/suites/rados/upgrade/hammer-x-singleton/0-cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml b/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..e4d8423
--- /dev/null
+++ b/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB

diff --git a/suites/rados/verify/clusters/+ b/suites/rados/verify/clusters/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/verify/clusters/openstack.yaml b/suites/rados/verify/clusters/openstack.yaml
new file mode 100644 (file)
index 0000000..e4d8423
--- /dev/null
+++ b/suites/rados/verify/clusters/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB