openstack: define the resources required to run a rados suite

Signed-off-by: Loic Dachary <loic@dachary.org>
2025-02-22 02:27:29 +00:00 · 2016-03-30 01:45:14 +02:00 · 2016-03-30 01:45:14 +02:00 · d9a8f49fc5
commit d9a8f49fc5
parent c2033806d6
40 changed files with 137 additions and 13 deletions
--- a/suites/rados/basic/clusters/+
+++ b/suites/rados/basic/clusters/+
--- a/suites/rados/basic/clusters/openstack.yaml
+++ b/suites/rados/basic/clusters/openstack.yaml
@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- a/suites/rados/thrash-erasure-code-big/cluster/+
+++ b/suites/rados/thrash-erasure-code-big/cluster/+
--- a/suites/rados/thrash-erasure-code-big/cluster/openstack.yaml
+++ 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
--- a/suites/rados/thrash-erasure-code-shec/clusters/+
+++ b/suites/rados/thrash-erasure-code-shec/clusters/+
--- a/suites/rados/thrash-erasure-code-shec/clusters/openstack.yaml
+++ 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
--- 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
--- a/suites/rados/upgrade/hammer-x-singleton/0-cluster/+
+++ b/suites/rados/upgrade/hammer-x-singleton/0-cluster/+
--- a/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml
+++ 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
--- a/suites/rados/verify/clusters/+
+++ b/suites/rados/verify/clusters/+
--- a/suites/rados/verify/clusters/openstack.yaml
+++ b/suites/rados/verify/clusters/openstack.yaml
@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB