From: Michael Fritch <mfritch@suse.com>
Date: Tue, 25 Feb 2020 02:32:49 +0000 (-0700)
Subject: mgr/cephadm: add a minimal ganesha.conf
X-Git-Tag: v15.2.1~19^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=156901103dc339302dc4e35fbe46b3989e5823bd;p=ceph.git

mgr/cephadm: add a minimal ganesha.conf

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

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2606cc3543bba8afc67e8f78185286123fd71744)
---

diff --git a/src/pybind/mgr/cephadm/nfs.py b/src/pybind/mgr/cephadm/nfs.py
index 691a7850d89..61b4812e0bc 100644
--- a/src/pybind/mgr/cephadm/nfs.py
+++ b/src/pybind/mgr/cephadm/nfs.py
@@ -26,6 +26,18 @@ class NFSGanesha(object):
         # type: () -> str
         return 'admin' # TODO: 'nfs.' + self.daemon_id
 
+    def get_rados_config_name(self):
+        # type: () -> str
+        return 'conf-' + self.get_daemon_name()
+
+    def get_rados_config_url(self):
+        # type: () -> str
+        url = 'rados://' + self.pool + '/'
+        if self.namespace:
+            url += self.namespace + '/'
+        url += self.get_rados_config_name()
+        return url
+
     def create_keyring(self):
         # type: () -> str
         ret, keyring, err = self.mgr.mon_command({
@@ -34,12 +46,23 @@ class NFSGanesha(object):
         })
         return keyring
 
+    def get_ganesha_conf(self):
+        # type: () -> str
+        return '''# generated by cephadm
+RADOS_URLS {{
+        UserId = "{user}";
+}}
+
+%url    {url}
+'''.format(user=self.get_rados_user(),
+           url=self.get_rados_config_url())
+
     def get_cephadm_config(self):
         # type: () -> Dict
         config = {'pool' : self.pool} # type: Dict
         if self.namespace:
             config['namespace'] = self.namespace
         config['files'] = {
-            'ganesha.conf' : '', # TODO: add ganesha.conf
+            'ganesha.conf' : self.get_ganesha_conf(),
         }
         return config