ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-nfs: allow overriding NFS_CORE_PARAM 

We already have config override variables for existing block (like
ganesha_ceph_export_overrides, ganesha_log_overrides, etc...) or a
global one (ganesha_conf_overrides) but redefining the NFS_CORE_PARAM
block in that variable will erase all previous values (currently only
Bind_Addr).

ganesha_core_param_overrides: |
        Enable_UDP = false;
        NFS_Port = 2050;

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1941775

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 9817d29543)
pull/6731/head
Dimitri Savineau 2021-07-15 16:24:28 -04:00 committed by Dimitri Savineau
parent 93f37e4b5a
commit f2a95728f7
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/nfss.yml.sample
View File

@ -110,6 +110,7 @@ dummy:
# #Entries_HWMark = 100000; # #Entries_HWMark = 100000;
#} #}
# #
#ganesha_core_param_overrides:
#ganesha_ceph_export_overrides: #ganesha_ceph_export_overrides:
#ganesha_rgw_export_overrides: #ganesha_rgw_export_overrides:
#ganesha_rgw_section_overrides: #ganesha_rgw_section_overrides:

1
roles/ceph-nfs/defaults/main.yml
View File

@ -102,6 +102,7 @@ rgw_client_name: client.rgw.{{ ansible_facts['hostname'] }}
#Entries_HWMark = 100000; #Entries_HWMark = 100000;
#} #}
# #
#ganesha_core_param_overrides:
#ganesha_ceph_export_overrides: #ganesha_ceph_export_overrides:
#ganesha_rgw_export_overrides: #ganesha_rgw_export_overrides:
#ganesha_rgw_section_overrides: #ganesha_rgw_section_overrides:

1
roles/ceph-nfs/templates/ganesha.conf.j2
View File

@ -10,6 +10,7 @@ NFS_Core_Param
{% if ceph_nfs_bind_addr is defined %} {% if ceph_nfs_bind_addr is defined %}
Bind_Addr={{ ceph_nfs_bind_addr }}; Bind_Addr={{ ceph_nfs_bind_addr }};
{% endif %} {% endif %}
{{ ganesha_core_param_overrides | default(None) }}
} }
{% if ceph_nfs_disable_caching | bool or nfs_file_gw | bool %} {% if ceph_nfs_disable_caching | bool or nfs_file_gw | bool %}