sit.cephfs: Add share configured with vfs_ceph_new

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
samba-in-kubernetes · Aug 10, 2024 · ba53b45 · ba53b45
1 parent ae84f60
commit ba53b45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/playbooks/ansible/cluster-cephfs.yml b/playbooks/ansible/cluster-cephfs.yml
@@ -31,7 +31,7 @@ samba_netbios_name: "SIT-CEPHFS-TEST"
 
 samba_shares:
   - name: share
-    strategy: ['kclient', 'vfs']
+    strategy: ['kclient', 'vfs', 'vfs.new']
     samba:
       options:
         "acl_xattr:security_acl_name": "user.NTACL"
diff --git a/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.share.yml.j2 b/playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.share.yml.j2
@@ -2,7 +2,10 @@ resources:
 {%- for share in samba_shares +%}
   {%- for method in share.strategy | default([]) +%}
     {%- if method != 'kclient' +%}
-      {%- set provider = 'samba-vfs' +%}
+      {%- set provider = 'samba-vfs/new' +%}
+      {%- if method == 'vfs' %}
+        {%- set provider = 'samba-vfs/classic' +%}
+      {%- endif +%}
 - resource_type: ceph.smb.share
   cluster_id: site
   share_id: {{ share.name }}

diff --git a/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 b/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2
@@ -3,7 +3,10 @@
 comment = Volume '{{ volume.name }}' from {{ config.be.name }}({{ config.be.variant }} {{ method }})
 vfs objects = acl_xattr ceph_snapshots
   {%- if method != 'kclient' %}
-    {%- set vfs = 'ceph' %} {{ vfs }}
+    {%- set vfs = 'ceph_new' %}
+    {%- if method == 'vfs' %}
+      {%- set vfs = 'ceph' %}
+    {%- endif %} {{ vfs }}
 {{ vfs }}:config_file = /etc/ceph/sit.ceph.conf
 {{ vfs }}:user_id = sit
 path = {{ subvol }}