From e4b3673262be61ed21178d46cd53ecf7e1969598 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 May 2021 16:27:34 -0400 Subject: [PATCH] mgr/nfs: move export ganesha conf translation into caller This belongs in the (one) caller, not the helper. Signed-off-by: Sage Weil --- src/pybind/mgr/nfs/export.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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: -- 2.47.3