From 3d064ddf19a1cac51156dfc4898b5a83a43d9344 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Thu, 21 Sep 2023 10:13:13 +0200 Subject: [PATCH] mgr/cephadm: removing double quotes from the generated nvmeof config Fixes: https://tracker.ceph.com/issues/62838 Signed-off-by: Redouane Kachach (cherry picked from commit 6b8187b2ec8a3bf9092da72c7a8b00dc7e5e1ce3) --- .../cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 | 2 +- src/pybind/mgr/cephadm/tests/test_services.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 b6b063f08edd7..69b8332cde391 100644 --- 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 b646360af41a6..2300b288d2951 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -361,6 +361,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)) @@ -394,10 +395,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( -- 2.39.5