Merge pull request ceph#62169 from anoopcs9/mgr-smb-add-ceph-snapshots

mgr/smb: Add ceph_snapshots vfs module to share definition

Reviewed-by: Avan Thakkar <[email protected]>
Reviewed-by: John Mulligan <[email protected]>

Author: adk3798

qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml

@@ -43,7 +43,7 @@ tasks:
             globals = ["default", "domain"]
             instance_name = "SAMBA"
             [shares.share1.options]
-            "vfs objects" = "acl_xattr ceph"
+            "vfs objects" = "acl_xattr ceph_snapshots ceph"
             path = "/"
             "acl_xattr:security_acl_name" = "user.NTACL"
             "ceph:config_file" = "/etc/ceph/ceph.conf"

qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml

@@ -42,7 +42,7 @@ tasks:
           globals = ["default", "domain"]
           instance_name = "SAMBA"
           [shares.share1.options]
-          "vfs objects" = "acl_xattr ceph"
+          "vfs objects" = "acl_xattr ceph_snapshots ceph"
           path = "/"
           "acl_xattr:security_acl_name" = "user.NTACL"
           "ceph:config_file" = "/etc/ceph/ceph.conf"

src/pybind/mgr/smb/handler.py

@@ -1187,7 +1187,7 @@ def _generate_share(
         # smb.conf options
         'options': {
             'path': path,
-            "vfs objects": f"acl_xattr {ceph_vfs}",
+            "vfs objects": f"acl_xattr ceph_snapshots {ceph_vfs}",
             'acl_xattr:security_acl_name': 'user.NTACL',
             f'{ceph_vfs}:config_file': '/etc/ceph/ceph.conf',
             f'{ceph_vfs}:filesystem': cephfs.volume,