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

sit.cephfs: Add proxy enbaled shares with vfs_ceph_new (mgr) #130

Merged
merged 3 commits into from
Mar 1, 2025
+5 −2
Merged

sit.cephfs: Add proxy enbaled shares with vfs_ceph_new (mgr) #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2afa37f
sit.cephfs: Rename 'vfs-new-proxy' to 'vfs-proxy'
anoopcs9 Feb 28, 2025
77542af
config.yml: Add proxy to the list of mgr variant methods
anoopcs9 Feb 28, 2025
2f69fc4
sit.cephfs: Add proxy enabled shares for mgr variant
anoopcs9 Feb 28, 2025
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
2 changes: 2 additions & 0 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
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion playbooks/ansible/roles/sit.cephfs/templates/smb_share.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 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 @@ -21,6 +21,7 @@ config:
{%- set methods = ['vfs'] +%}
{%- if variant == 'mgr' %}
{{ methods.append('vfs-new') }}
{{ methods.append('vfs-proxy') }}
{%- endif +%}
{%- endif +%}
methods: {{ methods }}
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', 'vfs-new-proxy']
methods: ['kclient', 'vfs', 'vfs-new', 'vfs-proxy']

nodes:
setup:
Expand Down
Loading