Merge pull request ceph#58153 from anoopcs9/modify-smb-dot-conf

mgr/smb: Make appropriate changes to global and share specific options

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

Author: adk3798

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

@@ -43,15 +43,15 @@ tasks:
             globals = ["default", "domain"]
             instance_name = "SAMBA"
             [shares.share1.options]
-            "vfs objects" = "ceph"
+            "vfs objects" = "acl_xattr ceph"
             path = "/"
+            "acl_xattr:security_acl_name" = "user.NTACL"
             "ceph:config_file" = "/etc/ceph/ceph.conf"
             "ceph:user_id" = "smbdata"
             "kernel share modes" = "no"
             "read only" = "no"
             "browseable" = "yes"
             [globals.default.options]
-            "server min protocol" = "SMB2"
             "load printers" = "no"
             "printing" = "bsd"
             "printcap name" = "/dev/null"

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

@@ -42,15 +42,15 @@ tasks:
           globals = ["default", "domain"]
           instance_name = "SAMBA"
           [shares.share1.options]
-          "vfs objects" = "ceph"
+          "vfs objects" = "acl_xattr ceph"
           path = "/"
+          "acl_xattr:security_acl_name" = "user.NTACL"
           "ceph:config_file" = "/etc/ceph/ceph.conf"
           "ceph:user_id" = "smbdata"
           "kernel share modes" = "no"
           "read only" = "no"
           "browseable" = "yes"
           [globals.default.options]
-          "server min protocol" = "SMB2"
           "load printers" = "no"
           "printing" = "bsd"
           "printcap name" = "/dev/null"

src/pybind/mgr/smb/handler.py

@@ -1043,7 +1043,8 @@ def _generate_share(
         # smb.conf options
         'options': {
             'path': path,
-            "vfs objects": "ceph",
+            "vfs objects": "acl_xattr ceph",
+            'acl_xattr:security_acl_name': 'user.NTACL',
             'ceph:config_file': '/etc/ceph/ceph.conf',
             'ceph:filesystem': share.cephfs.volume,
             'ceph:user_id': cephx_entity,
@@ -1134,7 +1135,6 @@ def _generate_config(
         'globals': {
             'default': {
                 'options': {
-                    'server min protocol': 'SMB2',
                     'load printers': 'No',
                     'printing': 'bsd',
                     'printcap name': '/dev/null',

src/pybind/mgr/smb/tests/test_smb.py

@@ -421,7 +421,8 @@ def test_share_dump_config(tmodule):
                     'browseable': 'Yes',
                     'kernel share modes': 'no',
                     'x:ceph:id': 'foo.s1',
-                    'vfs objects': 'ceph',
+                    'vfs objects': 'acl_xattr ceph',
+                    'acl_xattr:security_acl_name': 'user.NTACL',
                     'ceph:config_file': '/etc/ceph/ceph.conf',
                     'ceph:filesystem': 'cephfs',
                     'ceph:user_id': 'smb.fs.cluster.foo',
@@ -434,7 +435,8 @@ def test_share_dump_config(tmodule):
                     'browseable': 'Yes',
                     'kernel share modes': 'no',
                     'x:ceph:id': 'foo.stwo',
-                    'vfs objects': 'ceph',
+                    'vfs objects': 'acl_xattr ceph',
+                    'acl_xattr:security_acl_name': 'user.NTACL',
                     'ceph:config_file': '/etc/ceph/ceph.conf',
                     'ceph:filesystem': 'cephfs',
                     'ceph:user_id': 'smb.fs.cluster.foo',
@@ -444,7 +446,6 @@ def test_share_dump_config(tmodule):
         'globals': {
             'default': {
                 'options': {
-                    'server min protocol': 'SMB2',
                     'load printers': 'No',
                     'printing': 'bsd',
                     'printcap name': '/dev/null',