From: Sage Weil <sage@newdream.net>
Date: Wed, 26 May 2021 17:43:57 +0000 (-0400)
Subject: mgr/cephadm: nfs: drop attr_expiration_time from top-level config
X-Git-Tag: v16.2.7~116^2~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2afcd86515835643b90b881f047fab99b9244499;p=ceph.git

mgr/cephadm: nfs: drop attr_expiration_time from top-level config

This is added on a per-export basis with the same default of 0.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 283a8c184e748a0af5a5deedc2d80b855d747924)
---

diff --git a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
index e961cbc1509..9d6e15f1c4f 100644
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -9,10 +9,6 @@ NFS_CORE_PARAM {
 {% endif %}
 }
 
-EXPORT_DEFAULTS {
-        Attr_Expiration_Time = 0;
-}
-
 NFSv4 {
         Delegations = false;
         RecoveryBackend = 'rados_cluster';