From: Josh Durgin Date: Tue, 1 Mar 2016 05:55:39 +0000 (-0800) Subject: rbd/cli: add older default features X-Git-Tag: v11.1.1~58^2^2~336^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b82fe3d6f295c5ea982a1ec5e483a8f65ca0978b;p=ceph-ci.git 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 --- diff --git a/suites/rbd/cli/features/format-1.yaml b/suites/rbd/cli/features/format-1.yaml new file mode 100644 index 00000000000..9c532083553 --- /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 233dd53667c..420e3d5fde1 100644 --- 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 index 8b137891791..00000000000 --- a/suites/rbd/cli/features/none.yaml +++ /dev/null @@ -1 +0,0 @@ -