Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Sep 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1d0f8
settings.yml: Rename 'vfs.new' to 'vfs-new' for cephfs
anoopcs9 Sep 11, 2024
d251d00
sit.cephfs: Add share configured with vfs_ceph_new(mgr)
anoopcs9 Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions playbooks/ansible/roles/sit.cephfs/templates/ceph.smb.share.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions playbooks/roles/local.defaults/templates/config.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 +%}
anoopcs9 marked this conversation as resolved.
Show resolved Hide resolved
{%- endif +%}
methods: {{ methods }}
{%- endif +%}
Expand Down
2 changes: 1 addition & 1 deletion playbooks/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ environments:
data:
branch: main
ctdb_mutex: rados
methods: ['kclient', 'vfs', 'vfs.new']
methods: ['kclient', 'vfs', 'vfs-new']

nodes:
setup:
Expand Down
Loading