mgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm

Fixes https://tracker.ceph.com/issues/65259

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit aa4adf97f6daec0a85b042a1591a6cc7ac137d14)

diff --git a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
index 1d57fdd866e5d47ee676e5db0e93ce1d350313f4..22223c9736b1650d81744c6f3ec1803277c44147 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
@@ -16,6 +16,9 @@ omap_file_lock_duration = {{ spec.omap_file_lock_duration }}
 omap_file_lock_retries = {{ spec.omap_file_lock_retries }}
 omap_file_lock_retry_sleep_interval = {{ spec.omap_file_lock_retry_sleep_interval }}
 omap_file_update_reloads = {{ spec.omap_file_update_reloads }}
+allowed_consecutive_spdk_ping_failures = {{ spec.allowed_consecutive_spdk_ping_failures }}
+spdk_ping_interval_in_seconds = {{ spec.spdk_ping_interval_in_seconds }}
+ping_spdk_under_lock = {{ spec.ping_spdk_under_lock }}
 
 [gateway-logs]
 log_level = {{ spec.log_level }}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 1d6c5b4d506c3e4b6de3a9a384154fceac3bd1ef..b986708066a9fa28cdde6a9025e6e2231c39dece 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -385,6 +385,9 @@ omap_file_lock_duration = 60
 omap_file_lock_retries = 15
 omap_file_lock_retry_sleep_interval = 5
 omap_file_update_reloads = 10
+allowed_consecutive_spdk_ping_failures = 1
+spdk_ping_interval_in_seconds = 2.0
+ping_spdk_under_lock = False
 
 [gateway-logs]
 log_level = INFO