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 b8d474b..0e2b839 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 @@ -4,6 +4,8 @@ resources: {%- set provider = 'samba-vfs/new' +%} {%- if method == 'vfs' +%} {%- set provider = 'samba-vfs/classic' +%} + {%- elif method == 'vfs-proxy' +%} + {%- set provider = 'samba-vfs/proxied' +%} {%- endif +%} - resource_type: ceph.smb.share cluster_id: site diff --git a/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 b/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 index ba45678..8658623 100644 --- a/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 +++ b/playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2 @@ -9,7 +9,7 @@ vfs objects = acl_xattr ceph_snapshots {%- endif %} {{ vfs }} {{ vfs }}:config_file = /etc/ceph/sit.ceph.conf {{ vfs }}:user_id = sit - {%- if method == 'vfs-new-proxy' +%} + {%- if method == 'vfs-proxy' +%} {{ vfs }}:proxy = yes {%- endif +%} path = {{ subvol }} diff --git a/playbooks/roles/local.defaults/templates/config.yml.j2 b/playbooks/roles/local.defaults/templates/config.yml.j2 index fe77410..57bae44 100644 --- a/playbooks/roles/local.defaults/templates/config.yml.j2 +++ b/playbooks/roles/local.defaults/templates/config.yml.j2 @@ -21,6 +21,7 @@ config: {%- set methods = ['vfs'] +%} {%- if variant == 'mgr' %} {{ methods.append('vfs-new') }} + {{ methods.append('vfs-proxy') }} {%- endif +%} {%- endif +%} methods: {{ methods }} diff --git a/playbooks/settings.yml b/playbooks/settings.yml index 4a23140..9d0268e 100644 --- a/playbooks/settings.yml +++ b/playbooks/settings.yml @@ -362,7 +362,7 @@ environments: data: branch: main ctdb_mutex: rados - methods: ['kclient', 'vfs', 'vfs-new', 'vfs-new-proxy'] + methods: ['kclient', 'vfs', 'vfs-new', 'vfs-proxy'] nodes: setup: