From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 1 Feb 2018 22:33:43 +0000 (-0800)
Subject: qa/tests: Add openstack volume/disk info for running in ovh
X-Git-Tag: v12.2.6~108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42b782a480ce9cbb405f378b1cf24886ce8fb92f;p=ceph.git

qa/tests: Add openstack volume/disk info for running in ovh

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 02a9aee1dc28707e1154fea19615ca0f1357ae91)
---

diff --git a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
index fc4873ceed1..4e516ab4192 100644
--- a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
+++ b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
@@ -1,3 +1,9 @@
+openstack:
+  - machine:
+      disk: 10
+    volumes:
+      count: 2
+      size: 20
 roles:
 - - mon.a
   - mgr.x
@@ -6,14 +12,6 @@ roles:
 - - osd.1
   - mon.b
   - client.0
-openstack:
-  - machine:
-      disk: 10 # GB
-      ram: 2000 # MB
-      cpus: 1
-    volumes: # attached to each instance
-      count: 2
-      size: 10 # GB
 tasks:
 - ssh_keys:
 - print: "**** done ssh_keys"
diff --git a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml b/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
index 837b1029bb2..bf4a7f98695 100644
--- a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
+++ b/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
@@ -2,6 +2,12 @@ overrides:
  ansible.cephlab: 
   vars: 
    quick_lvs_to_create: 4
+openstack:
+  - machine:
+      disk: 10
+    volumes:
+      count: 4
+      size: 20
 roles:
 - [mon.a, mgr.y, osd.0, osd.1]
 - [mon.b, osd.2, osd.3]