From e1a7fa3a628e3b152eb0ea0f8084e507c2742742 Mon Sep 17 00:00:00 2001
From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 21 Sep 2017 16:12:25 -0700
Subject: [PATCH] Fix few ceph-ansible tests

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---
 .../ceph-ansible/tasks/rados-python.yaml      |  9 ------
 .../smoke/ceph-ansible/tasks/rados_bench.yaml | 29 +++++++++++++++++++
 .../smoke/ceph-ansible/tasks/rados_cls.yaml   |  8 -----
 .../smoke/ceph-ansible/tasks/rbd_fsx.yaml     | 17 +++++++++++
 .../smoke/ceph-ansible/vars/downstream.yaml   |  1 +
 5 files changed, 47 insertions(+), 17 deletions(-)
 delete mode 100644 qa/suites/smoke/ceph-ansible/tasks/rados-python.yaml
 create mode 100644 qa/suites/smoke/ceph-ansible/tasks/rados_bench.yaml
 delete mode 100644 qa/suites/smoke/ceph-ansible/tasks/rados_cls.yaml
 create mode 100644 qa/suites/smoke/ceph-ansible/tasks/rbd_fsx.yaml

diff --git a/qa/suites/smoke/ceph-ansible/tasks/rados-python.yaml b/qa/suites/smoke/ceph-ansible/tasks/rados-python.yaml
deleted file mode 100644
index 5dbdcc08a778f..0000000000000
--- a/qa/suites/smoke/ceph-ansible/tasks/rados-python.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- ssh-keys:
-- ceph-ansible:
-- install.ship_utilities:
-- workunit:
-    clients:
-      client.0:
-        - rados/test_python.sh
-
diff --git a/qa/suites/smoke/ceph-ansible/tasks/rados_bench.yaml b/qa/suites/smoke/ceph-ansible/tasks/rados_bench.yaml
new file mode 100644
index 0000000000000..2ebe278111442
--- /dev/null
+++ b/qa/suites/smoke/ceph-ansible/tasks/rados_bench.yaml
@@ -0,0 +1,29 @@
+tasks:
+- ssh-keys:
+- ceph-ansible:
+- install.ship_utilities:
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
diff --git a/qa/suites/smoke/ceph-ansible/tasks/rados_cls.yaml b/qa/suites/smoke/ceph-ansible/tasks/rados_cls.yaml
deleted file mode 100644
index 0ab7324ec2c77..0000000000000
--- a/qa/suites/smoke/ceph-ansible/tasks/rados_cls.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ssh-keys:
-- ceph-ansible:
-- install.ship_utilities:
-- workunit:
-   clients:
-     client.0:
-       - cls
diff --git a/qa/suites/smoke/ceph-ansible/tasks/rbd_fsx.yaml b/qa/suites/smoke/ceph-ansible/tasks/rbd_fsx.yaml
new file mode 100644
index 0000000000000..337bb390b2b69
--- /dev/null
+++ b/qa/suites/smoke/ceph-ansible/tasks/rbd_fsx.yaml
@@ -0,0 +1,17 @@
+overrides:
+ ceph_ansible:
+   vars:
+      ceph_conf_overrides:
+          client:
+            rbd default data pool: datapool
+tasks:
+- ssh-keys:
+- ceph-ansible:
+- install.ship_utilities:
+- exec:
+    client.0:
+      - sudo ceph osd pool create datapool 4
+      - rbd pool init datapool
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
diff --git a/qa/suites/smoke/ceph-ansible/vars/downstream.yaml b/qa/suites/smoke/ceph-ansible/vars/downstream.yaml
index 7d6fbf48a8bc7..c6fe3946e4afc 100644
--- a/qa/suites/smoke/ceph-ansible/vars/downstream.yaml
+++ b/qa/suites/smoke/ceph-ansible/vars/downstream.yaml
@@ -4,6 +4,7 @@ overrides:
       ceph_stable: true
       ceph_origin: distro
       ceph_stable_rh_storage: true
+      ceph_repository: rhcs
       ceph_stable_release: luminous
       journal_collocation: true
       journal_size: 1024
-- 
2.39.5