mirror of https://github.com/ceph/ceph-ansible.git
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/6730/head
parent
559b379f73
commit
925e3efc35
|
@ -123,6 +123,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:
|
||||||
|
|
|
@ -115,6 +115,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:
|
||||||
|
|
|
@ -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 or nfs_file_gw %}
|
{% if ceph_nfs_disable_caching or nfs_file_gw %}
|
||||||
|
|
Loading…
Reference in New Issue