From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 21:06:54 +0000 (-0700)
Subject: cephadm: trim nfs.json sample
X-Git-Tag: v15.1.1~21^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f4ee1c9afc20424c60aca0d5075944b63e66b0d;p=ceph.git

cephadm: trim nfs.json sample

we only need to specify the rados pool and config object url

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/samples/nfs.json b/src/cephadm/samples/nfs.json
index 1b01489d856..2e6625101da 100644
--- a/src/cephadm/samples/nfs.json
+++ b/src/cephadm/samples/nfs.json
@@ -3,40 +3,8 @@
     "namespace" : "nfs-ns",
     "files": {
         "ganesha.conf": [
-            "NFS_CORE_PARAM {",
-            "        Enable_NLM = false;",
-            "        Enable_RQUOTA = false;",
-            "        Protocols = 4;",
-            "}",
-            "",
-            "CACHEINODE {",
-            "        Dir_Chunk = 0;",
-            "        NParts = 1;",
-            "        Cache_Size = 1;",
-            "}",
-            "",
-            "EXPORT_DEFAULTS {",
-            "        Attr_Expiration_Time = 0;",
-            "}",
-            "",
-            "NFSv4 {",
-            "        Delegations = false;",
-            "        RecoveryBackend = 'rados_cluster';",
-            "        Minor_Versions = 1, 2;",
-            "}",
-            "",
-            "RADOS_KV {",
-            "        ceph_conf = '/etc/ceph/ceph.conf';",
-            "        userid = admin;",
-            "        nodeid = nfs.a;",
-            "        pool = 'nfs-ganesha';",
-            "        namespace = 'nfs-ns';",
-            "}",
-            "",
             "RADOS_URLS {",
-            "        ceph_conf = '/etc/ceph/ceph.conf';",
             "        userid = admin;",
-            "        watch_url = 'rados://nfs-ganesha/nfs-ns/conf-nfs.a';",
             "}",
             "",
             "%url    rados://nfs-ganesha/nfs-ns/conf-nfs.a",