rbd/librbd: fix the cache mode facet

This appears to have been broken, which means we weren't actually testing
any of the non-default cache modes (writethrough, none).  Whoops!  We were
getting jobs like

task:
- install: null
- ceph:
    conf:
      client:
        rbd cache: false
tasks:
- chef: null
- clock: null
- install: null
- ceph: null
- rbd_fsx:
    clients:
    - client.0
    ops: 5000

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/rbd/librbd/cache/none.yaml b/suites/rbd/librbd/cache/none.yaml
index 5b04b673d909b7cae81d06ed64ce35fbfde8dcfc..42fd9c95562ac379f0c83658d68a87870c1b01f2 100644 (file)
--- a/suites/rbd/librbd/cache/none.yaml
+++ b/suites/rbd/librbd/cache/none.yaml
@@ -1,4 +1,4 @@
-task:
+tasks:
 - install:
 - ceph:
     conf:

diff --git a/suites/rbd/librbd/cache/writeback.yaml b/suites/rbd/librbd/cache/writeback.yaml
index f8de49b46db00e6c93affff3ececf39f5b25660a..86fe06afa0501c95d634d57e89e16fe93f78628c 100644 (file)
--- a/suites/rbd/librbd/cache/writeback.yaml
+++ b/suites/rbd/librbd/cache/writeback.yaml
@@ -1,4 +1,4 @@
-task:
+tasks:
 - install:
 - ceph:
     conf:

diff --git a/suites/rbd/librbd/cache/writethrough.yaml b/suites/rbd/librbd/cache/writethrough.yaml
index edba88c07766d669910f709cc16374197cd1b252..6dc29e16c02c72bff94c37ca84b4f78ab330fdd3 100644 (file)
--- a/suites/rbd/librbd/cache/writethrough.yaml
+++ b/suites/rbd/librbd/cache/writethrough.yaml
@@ -1,4 +1,4 @@
-task:
+tasks:
 - install:
 - ceph:
     conf:

diff --git a/suites/rbd/librbd/ceph/ceph.yaml b/suites/rbd/librbd/ceph/ceph.yaml
deleted file mode 100644 (file)
index 2030acb..0000000
--- a/suites/rbd/librbd/ceph/ceph.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph: