From: Vikhyat Umrao <vumrao@redhat.com>
Date: Wed, 13 Jan 2016 11:06:23 +0000 (+0530)
Subject: [RM-14355] Remove "filestore xattr use omap = true"
X-Git-Tag: v1.5.32~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F382%2Fhead;p=ceph-deploy.git

[RM-14355] Remove "filestore xattr use omap = true"

This patch removes option "filestore_xattr_use_omap"
from default ceph.conf global section,
as this option was removed in #7408.

Cleanup #14355

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
---

diff --git a/ceph_deploy/new.py b/ceph_deploy/new.py
index 359f6bf..7f308d4 100644
--- a/ceph_deploy/new.py
+++ b/ceph_deploy/new.py
@@ -190,9 +190,6 @@ def new(args):
     cfg.set('global', 'auth service required', 'cephx')
     cfg.set('global', 'auth client required', 'cephx')
 
-    # http://tracker.newdream.net/issues/3138
-    cfg.set('global', 'filestore xattr use omap', 'true')
-
     path = '{name}.conf'.format(
         name=args.cluster,
         )
diff --git a/ceph_deploy/tests/test_cli_new.py b/ceph_deploy/tests/test_cli_new.py
index cdd2ae6..809709c 100644
--- a/ceph_deploy/tests/test_cli_new.py
+++ b/ceph_deploy/tests/test_cli_new.py
@@ -68,4 +68,3 @@ def test_defaults(newcfg):
     assert cfg.get('global', 'auth cluster required') == 'cephx'
     assert cfg.get('global', 'auth service required') == 'cephx'
     assert cfg.get('global', 'auth client required') == 'cephx'
-    assert cfg.get('global', 'filestore_xattr_use_omap') == 'true'