mgr/cephadm: add "allow_set_io_flusher_fail = true;" to ganesha conf

This is necessary for ganesha 6.1 running in a container
to start up without hitting a permission failure (without
having to run the container as --privileged)  and doesn't
seem to cause any damage when read in by ganesha v5.9 (the
current version in the main branch containers)

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 3e3b7fa8ea22a2dd7f5d5c97d6e096a5e30585f4)

diff --git a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
index ded403169c976e68bee5e4c8185cae475719d5af..03ff8a32ca2923c9cb24f369b51b6bae9aca9b43 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -4,6 +4,7 @@ NFS_CORE_PARAM {
         Enable_RQUOTA = false;
         Protocols = 4;
         NFS_Port = {{ port }};
+        allow_set_io_flusher_fail = true;
 {% if bind_addr %}
         Bind_addr = {{ bind_addr }};
 {% endif %}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index d54c04b93455d30c56cb7157902ab9116c061455..94a67904d06961c8df6e6e9535f40ba3b0cfc4da 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -2621,6 +2621,7 @@ class TestIngressService:
             '        Enable_RQUOTA = false;\n'
             '        Protocols = 4;\n'
             '        NFS_Port = 2049;\n'
+            '        allow_set_io_flusher_fail = true;\n'
             '        HAProxy_Hosts = 192.168.122.111, 10.10.2.20, 192.168.122.222;\n'
             '}\n'
             '\n'