mgr/cephadm: removing double quotes from the generated nvmeof config

Fixes: https://tracker.ceph.com/issues/62838
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

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 b6f10a9982e17f6669e60e17d10e08cce28172e2..72a3e5839edc43c49f6c0c0408ff77a4db242546 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
@@ -30,5 +30,5 @@ transports = {{ spec.transports }}
 transport_tcp_options = {{ transport_tcp_options }}
 {% endif %}
 {% if spec.tgt_cmd_extra_args %}
-tgt_cmd_extra_args = {{ spec.tgt_cmd_extra_args | tojson }}
+tgt_cmd_extra_args = {{ spec.tgt_cmd_extra_args }}
 {% endif %}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 2137c80c96f42749fb73a2149c7de51a3ad03b75..21c62ffd06fb77170b0f2dce86753741dd18cb87 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -375,6 +375,7 @@ class TestNVMEOFService:
 
         nvmeof_daemon_id = 'testpool.test.qwert'
         pool = 'testpool'
+        tgt_cmd_extra_args = '--cpumask=0xFF --msg-mempool-size=524288'
         default_port = 5500
         group = 'mygroup'
         _run_cephadm.side_effect = async_side_effect(('{}', '', 0))
@@ -408,10 +409,12 @@ timeout = 60
 log_level = WARN
 conn_retries = 10
 transports = tcp
-transport_tcp_options = {{"in_capsule_data_size": 8192, "max_io_qpairs_per_ctrlr": 7}}\n"""
+transport_tcp_options = {{"in_capsule_data_size": 8192, "max_io_qpairs_per_ctrlr": 7}}
+tgt_cmd_extra_args = {tgt_cmd_extra_args}\n"""
 
         with with_host(cephadm_module, 'test'):
             with with_service(cephadm_module, NvmeofServiceSpec(service_id=pool,
+                                                                tgt_cmd_extra_args=tgt_cmd_extra_args,
                                                                 group=group,
                                                                 pool=pool)):
                 _run_cephadm.assert_called_with(