sit.cephfs: Add share configured with vfs_ceph_new(mgr)

Signed-off-by: Anoop C S <[email protected]>
samba-in-kubernetes · Sep 12, 2024 · dd10e56 · dd10e56
1 parent 945413e
commit dd10e56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
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
@@ -1,10 +1,13 @@
 resources:
 {%- for share in samba_shares +%}
   {%- for method in config.be.methods +%}
-    {%- 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 }}
+  share_id: {{ share.name }}-{{ method }}
   intent: present
   name: {{ share.name }}-{{ config.be.name }}-{{ config.be.variant }}-{{ method }}
   cephfs:

diff --git a/playbooks/roles/local.defaults/templates/config.yml.j2 b/playbooks/roles/local.defaults/templates/config.yml.j2
@@ -19,6 +19,9 @@ config:
       {%- set methods = settings.environments[be].data.methods +%}
       {%- if variant != 'default' +%}
         {%- set methods = ['vfs'] +%}
+        {%- if variant == 'mgr' %}
+          {{ methods.append('vfs-new') }}
+        {%- endif +%}
       {%- endif +%}
     methods: {{ methods }}
     {%- endif +%}