openstack: convert to array hints

So that it is more flexible.

http://tracker.ceph.com/issues/13581 Fixes: #13581

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 8f2af5949c8ed4e24cedd8a6df0d169733e14926)

Conflicts:
	suites/smoke/1node/clusters/openstack.yaml (does not exist)

diff --git a/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml
index f8f509e1c43dae247761ea062a47f32ddd938bfe..1e090fad379da796147f91019e7bcdf42b7680b9 100644 (file)
--- a/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml
+++ b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml
@@ -15,13 +15,13 @@ roles:
   - mon.b
   - client.0
 openstack:
-  machine:
-    disk: 10 # GB
-    ram: 2000 # MB
-    cpus: 1
-  volumes: # attached to each instance
-    count: 3
-    size: 10 # GB
+  - machine:
+      disk: 10 # GB
+      ram: 2000 # MB
+      cpus: 1
+    volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
 tasks:
 - install:
      extras: yes

diff --git a/suites/rados/objectstore/alloc-hint.yaml b/suites/rados/objectstore/alloc-hint.yaml
index d8dd2c32915aaba5555109071e25e875981901f9..8f8d4841eb07653c8ce7466f55d0e99d70f330fd 100644 (file)
--- a/suites/rados/objectstore/alloc-hint.yaml
+++ b/suites/rados/objectstore/alloc-hint.yaml
@@ -16,10 +16,10 @@ tasks:
       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
+  - 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/msgr.yaml b/suites/rados/singleton-nomsgr/all/msgr.yaml
index fe2e0cc1592c3a75d15357314da018225dd80256..86c717f6686a470d9227f3ee0dfcd2c6b57533fb 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/msgr.yaml
+++ b/suites/rados/singleton-nomsgr/all/msgr.yaml
@@ -7,10 +7,10 @@ tasks:
           - ceph_test_async_driver
           - ceph_test_msgr
 openstack:
-  machine:
-    disk: 40 # GB
-    ram: 15000 # MB
-    cpus: 1
-  volumes: # attached to each instance
-    count: 0
-    size: 1 # GB
+  - machine:
+      disk: 40 # GB
+      ram: 15000 # MB
+      cpus: 1
+    volumes: # attached to each instance
+      count: 0
+      size: 1 # GB

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