mgr/smb: Add new configs to share definition

Inorder to support Microsoft Management Console (MMC) plugin feature,
ceph manager must handle all fields supported by `add share command`
and related smb.conf options.

Added "comment" and "max connections" entries to the Samba
configuration generated by the Ceph Manager module. These fields
are required for MMC integration and will be made configurable in a
future update.

Signed-off-by: Shwetha K Acharya <Shwetha.K.Acharya@ibm.com>
(cherry picked from commit 74288183964c4d02a7528ab9fdf21c518930b401)

diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml
index d92ccad96f2584a896b59761d5714e0309a22b11..cb5c78d514fd9af365d141706602ed613dd1bc22 100644 (file)
--- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml
+++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml
@@ -51,6 +51,8 @@ tasks:
             "kernel share modes" = "no"
             "read only" = "no"
             "browseable" = "yes"
+            "comment" = ""
+            "max connections" = "0"
             [globals.default.options]
             "load printers" = "no"
             "printing" = "bsd"

diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml
index c8c91f908df370fdc3df2e138fa67b02764b26f7..9f93c740a8e7a9ab4e0b59861a32d6e67172b1de 100644 (file)
--- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml
+++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml
@@ -50,6 +50,8 @@ tasks:
           "kernel share modes" = "no"
           "read only" = "no"
           "browseable" = "yes"
+          "comment" = ""
+          "max connections" = "0"
           [globals.default.options]
           "load printers" = "no"
           "printing" = "bsd"

diff --git a/src/pybind/mgr/smb/handler.py b/src/pybind/mgr/smb/handler.py
index e0dc9518902523fefc261e242d3c5c153de7c496..73e635521bb188b7406b8423d60caf9dcf1cf383 100644 (file)
--- a/src/pybind/mgr/smb/handler.py
+++ b/src/pybind/mgr/smb/handler.py
@@ -1196,6 +1196,8 @@ def _generate_share(
             'browseable': ynbool(share.browseable),
             'kernel share modes': 'no',
             'x:ceph:id': f'{share.cluster_id}.{share.share_id}',
+            'comment': '',
+            'max connections': '0',
         }
     }
     if proxy_val: