From: Sage Weil <sage@newdream.net>
Date: Wed, 26 May 2021 20:27:34 +0000 (-0400)
Subject: mgr/nfs: move export ganesha conf translation into caller
X-Git-Tag: v17.1.0~1551^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4b3673262be61ed21178d46cd53ecf7e1969598;p=ceph.git

mgr/nfs: move export ganesha conf translation into caller

This belongs in the (one) caller, not the helper.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/nfs/export.py b/src/pybind/mgr/nfs/export.py
index 84d467381128..7031f7513047 100644
--- a/src/pybind/mgr/nfs/export.py
+++ b/src/pybind/mgr/nfs/export.py
@@ -45,9 +45,6 @@ class NFSRados:
         return {'block_name': '%url', 'value': self._make_rados_url(obj_name)}
 
     def write_obj(self, conf_block, obj, config_obj=''):
-        if 'export-' in obj:
-            conf_block = GaneshaConfParser.write_block(conf_block)
-
         with self.mgr.rados.open_ioctx(self.pool) as ioctx:
             ioctx.set_namespace(self.namespace)
             ioctx.write_full(obj, conf_block.encode('utf-8'))
@@ -231,8 +228,11 @@ class ExportMgr:
 
     def _save_export(self, export):
         self.exports[self.rados_namespace].append(export)
-        NFSRados(self.mgr, self.rados_namespace).write_obj(export.to_export_block(),
-                 f'export-{export.export_id}', f'conf-nfs.{export.cluster_id}')
+        NFSRados(self.mgr, self.rados_namespace).write_obj(
+            GaneshaConfParser.write_block(export.to_export_block()),
+            f'export-{export.export_id}',
+            f'conf-nfs.{export.cluster_id}'
+        )
 
     def _delete_export(self, cluster_id, pseudo_path, export_obj=None):
         try: