sit.cephfs: Add optional support to use vfs_ceph_new

Accept the format 'cephfs.vfs.new' for backend variable to optionally configure CephFS shares using the recently merged[1] new vfs module. [1] https://gitlab.com/samba-team/samba/-/merge_requests/3718 Signed-off-by: Anoop C S <[email protected]>
samba-in-kubernetes · Aug 5, 2024 · a2bc91a · a2bc91a
1 parent cacd5a7
commit a2bc91a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/playbooks/ansible/roles/sit.cephfs/tasks/new_share.yml b/playbooks/ansible/roles/sit.cephfs/tasks/new_share.yml
@@ -16,3 +16,4 @@
     dest: "{{ file }}"
   vars:
     subvol: "{{ ceph_subvol.stdout }}"
+    vfs_mode: "{{ (config.be.suffix == 'new') | ternary('ceph_new', 'ceph') }}"
diff --git a/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 b/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2
@@ -1,9 +1,9 @@
 [{{ name }}-{{ config.be.name }}-{{ config.be.variant }}]
 comment = Volume '{{ name }}' from {{ config.be.name }}({{ config.be.variant }})
 vfs objects = acl_xattr ceph_snapshots
-{%- if config.be.variant == 'vfs' %} ceph
-ceph:config_file = /etc/ceph/sit.ceph.conf
-ceph:user_id = sit
+{%- if config.be.variant == 'vfs' %} {{ vfs_mode }}
+{{ vfs_mode }}:config_file = /etc/ceph/sit.ceph.conf
+{{ vfs_mode }}:user_id = sit
 path = {{ subvol }}
 {%- else +%}
 path = {{ path }}