From 739b1d6c4391ff8db17dafa4233135915867a594 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 21 Oct 2015 10:48:43 +0200
Subject: [PATCH] ceph-disk: switch to using install / ceph

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 suites/ceph-disk/basic/options/ceph-conf.yaml | 11 -------
 suites/ceph-disk/basic/tasks/ceph-disk.yaml   | 31 +++++++++----------
 2 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 suites/ceph-disk/basic/options/ceph-conf.yaml

diff --git a/suites/ceph-disk/basic/options/ceph-conf.yaml b/suites/ceph-disk/basic/options/ceph-conf.yaml
deleted file mode 100644
index ac93c7f7e431f..0000000000000
--- a/suites/ceph-disk/basic/options/ceph-conf.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-overrides:
-   ceph-deploy:
-      separate_journal_disk:
-      only_mon: true
-      conf:
-         global:
-             mon pg warn min per osd: 2
-             osd pool default size: 2
-             osd crush chooseleaf type: 0 # failure domain == osd
-             osd pg bits: 2
-             osd pgp bits: 2
diff --git a/suites/ceph-disk/basic/tasks/ceph-disk.yaml b/suites/ceph-disk/basic/tasks/ceph-disk.yaml
index c767780cdf2f3..45081aa122d7d 100644
--- a/suites/ceph-disk/basic/tasks/ceph-disk.yaml
+++ b/suites/ceph-disk/basic/tasks/ceph-disk.yaml
@@ -1,31 +1,28 @@
-overrides:
-  ceph-deploy:
-    conf:
-      global:
-        debug ms: 1
-      osd:
-        debug osd: 10
-      mon:
-        debug mon: 10
 roles:
 - - mon.a
   - client.0
+- - osd.0
+  - osd.1
 openstack:
   machine:
-    disk: 10 # GB
+    disk: 20 # GB
     ram: 2000 # MB
     cpus: 1
   volumes: # attached to each instance
     count: 3
-    size: 1 # GB
+    size: 10 # GB
 tasks:
 - install:
-     extras: yes
-- print: "**** done install extras"
-- ssh_keys:
-- print: "**** done ssh_keys"
-- ceph-deploy:
-- print: "**** done ceph-deploy"
+- ceph:
+    fs: xfs # this implicitly means /dev/vd? are used instead of directories
+    wait-for-scrub: false
+    conf:
+       global:
+           mon pg warn min per osd: 2
+           osd pool default size: 2
+           osd crush chooseleaf type: 0 # failure domain == osd
+           osd pg bits: 2
+           osd pgp bits: 2
 #
 # Keep this around for debugging purposes. If uncommented the target
 # will pause and the workunit can be run and debug manually.
-- 
2.39.5