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 9817d29543099ca640ce8b23da2ab9f26179cba5)

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index 47ba271b611916a4dd25b444d18e1a7f1450abe4..d52f00f7d4008b244e093829d9b02b5f6e2bda53 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -123,6 +123,7 @@ dummy:
 #        #Entries_HWMark = 100000;
 #}
 #
+#ganesha_core_param_overrides:
 #ganesha_ceph_export_overrides:
 #ganesha_rgw_export_overrides:
 #ganesha_rgw_section_overrides:

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index e98bfb9f929b1dadeacc5515b7cc2a8e3ca55170..07ed97b91aeebc6c6159395ce3c4443e1e25a63d 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -115,6 +115,7 @@ rgw_client_name: client.rgw.{{ ansible_facts['hostname'] }}
         #Entries_HWMark = 100000;
 #}
 #
+#ganesha_core_param_overrides:
 #ganesha_ceph_export_overrides:
 #ganesha_rgw_export_overrides:
 #ganesha_rgw_section_overrides:

diff --git a/roles/ceph-nfs/templates/ganesha.conf.j2 b/roles/ceph-nfs/templates/ganesha.conf.j2
index 8c45255c14f579381fdb5bd76524527e1de3b4f4..aa159911224f138999e5bf5db860694886f782b9 100644 (file)
--- a/roles/ceph-nfs/templates/ganesha.conf.j2
+++ b/roles/ceph-nfs/templates/ganesha.conf.j2
@@ -10,6 +10,7 @@ NFS_Core_Param
 {% if ceph_nfs_bind_addr is defined %}
        Bind_Addr={{ ceph_nfs_bind_addr }};
 {% endif %}
+{{ ganesha_core_param_overrides | default(None) }}
 }
 
 {% if ceph_nfs_disable_caching or nfs_file_gw %}