diff --git a/playbooks/ansible/roles/sit.cephfs/tasks/new_share.yml b/playbooks/ansible/roles/sit.cephfs/tasks/new_share.yml index eca1d35..c707fff 100644 --- 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 index c4f4fbb..ea6bb7f 100644 --- 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 }}