From 078dcdd162a116cba7af080c24864da96f516715 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sat, 21 Nov 2015 11:08:37 +0100 Subject: [PATCH] openstack: convert to array hints So that it is more flexible. http://tracker.ceph.com/issues/13581 Fixes: #13581 Signed-off-by: Loic Dachary (cherry picked from commit 8f2af5949c8ed4e24cedd8a6df0d169733e14926) Conflicts: suites/smoke/1node/clusters/openstack.yaml (does not exist) --- .../basic/tasks/ceph-deploy_hello_world.yaml | 14 +++++++------- suites/rados/objectstore/alloc-hint.yaml | 14 +++++++------- suites/rados/singleton-nomsgr/all/msgr.yaml | 14 +++++++------- suites/rados/thrash/clusters/openstack.yaml | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) 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 f8f509e1c43da..1e090fad379da 100644 --- 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 d8dd2c32915aa..8f8d4841eb076 100644 --- 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 fe2e0cc1592c3..86c717f6686a4 100644 --- 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 00d927ac2328c..39e43d021ac5d 100644 --- 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 -- 2.39.5