From 08012a323f3e623c96eac395828a779ec8bc3d1b Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Wed, 14 Aug 2024 17:33:18 +0530 Subject: [PATCH] sit.cephfs: Add share configured with vfs_ceph_new(mgr) Signed-off-by: Anoop C S --- .../ansible/roles/sit.cephfs/templates/ceph.smb.share.yml.j2 | 5 ++++- playbooks/roles/local.defaults/templates/config.yml.j2 | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 index 6c048ed..b3cb8e5 100644 --- 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,7 +1,10 @@ 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 }} diff --git a/playbooks/roles/local.defaults/templates/config.yml.j2 b/playbooks/roles/local.defaults/templates/config.yml.j2 index 29fe04f..5f30f22 100644 --- 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 +%}