Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Oct 9, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
View file
Open in desktop
Expand Up @@ -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 %}
5 changes: 4 additions & 1 deletion src/pybind/mgr/cephadm/tests/test_services.py
View file
Open in desktop
Expand Up @@ -361,6 +361,7 @@ def test_nvmeof_config(self, _get_name, _run_cephadm, cephadm_module: CephadmOrc

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))
Expand Down Expand Up @@ -394,10 +395,12 @@ def test_nvmeof_config(self, _get_name, _run_cephadm, cephadm_module: CephadmOrc
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(
Expand Down