rbd/cli: add older default features

Explicitly set features and default format so they don't become out of
date. Remove none.yaml, since default.yaml is an explicit version of
it now.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/suites/rbd/cli/features/format-1.yaml b/suites/rbd/cli/features/format-1.yaml
new file mode 100644 (file)
index 0000000..9c53208
--- /dev/null
+++ b/suites/rbd/cli/features/format-1.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default format: 1

diff --git a/suites/rbd/cli/features/layering.yaml b/suites/rbd/cli/features/layering.yaml
index 233dd53667c87186ec96f2c9a430257086ccafcd..420e3d5fde177269b4ef8468b4b39e4d033c5db6 100644 (file)
--- a/suites/rbd/cli/features/layering.yaml
+++ b/suites/rbd/cli/features/layering.yaml
@@ -3,3 +3,4 @@ overrides:
     conf:
       client:
         rbd default format: 2
+        rbd default features: 1

diff --git a/suites/rbd/cli/features/none.yaml b/suites/rbd/cli/features/none.yaml
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/suites/rbd/cli/features/none.yaml
+++ /dev/null
@@ -1 +0,0 @@
-