From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Jul 2014 18:13:43 +0000 (-0700)
Subject: multimds: fix pjd overrides for fuse_default_permissions
X-Git-Tag: v0.94.10~27^2^2~387^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc1c12a460d76b11df6656043626c064aa2d8f9a;p=ceph.git

multimds: fix pjd overrides for fuse_default_permissions

Set the default (off) in the ceph task directly, so that there is only a
single overrides field that reenables.  Otherwise, the two overrides
fight each other with undefined precedence.

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

diff --git a/suites/multimds/basic/ceph/base.yaml b/suites/multimds/basic/ceph/base.yaml
index 81558aae5787..50b60b5152b1 100644
--- a/suites/multimds/basic/ceph/base.yaml
+++ b/suites/multimds/basic/ceph/base.yaml
@@ -1,8 +1,6 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0
 tasks:
 - install:
 - ceph:
+    conf:
+      client:
+        fuse_default_permissions: 0
diff --git a/suites/multimds/libcephfs/ceph/base.yaml b/suites/multimds/libcephfs/ceph/base.yaml
index c1cc0a93ce8b..50b60b5152b1 100644
--- a/suites/multimds/libcephfs/ceph/base.yaml
+++ b/suites/multimds/libcephfs/ceph/base.yaml
@@ -1,8 +1,6 @@
-overrides:
-  ceph:
-    conf:
-      client: 
-        fuse_default_permissions: 0
 tasks:
 - install:
 - ceph:
+    conf:
+      client:
+        fuse_default_permissions: 0
diff --git a/suites/multimds/verify/ceph/base.yaml b/suites/multimds/verify/ceph/base.yaml
index 81558aae5787..50b60b5152b1 100644
--- a/suites/multimds/verify/ceph/base.yaml
+++ b/suites/multimds/verify/ceph/base.yaml
@@ -1,8 +1,6 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0
 tasks:
 - install:
 - ceph:
+    conf:
+      client:
+        fuse_default_permissions: 0