From 870d53f1d9e92445cd8df81c4d8b2e79d0d57957 Mon Sep 17 00:00:00 2001 From: Tomer Haskalovitch Date: Tue, 24 Mar 2026 01:27:43 +0200 Subject: [PATCH] mgr/cephadm: support no pool value in spec for nvmeof gateway if no value was provided we will use ".nvmeof" by default Signed-off-by: Tomer Haskalovitch --- src/pybind/mgr/cephadm/tests/services/test_nvmeof.py | 5 +++++ src/python-common/ceph/deployment/service_spec.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py b/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py index a2e8ef35874f..64961e7fa760 100644 --- a/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py +++ b/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py @@ -293,3 +293,8 @@ timeout = 1.0\n""" 'group name \'right.group\' and service id \'pool4.wrong.group\'' ): cephadm_module._apply_service_spec(mismatch_nvmeof_spec_group_service_id_with_dot) + + def test_nvmeof_service_spec_defaults_pool_to_metadata_pool(self): + spec = NvmeofServiceSpec(service_id='pool4.bla.group', group='group') + + assert spec.pool == ".nvmeof" diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index a6963d4dadcb..3979675c7556 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -1772,8 +1772,8 @@ class NvmeofServiceSpec(ServiceSpec): extra_entrypoint_args=extra_entrypoint_args, custom_configs=custom_configs) - #: RADOS pool where ceph-nvmeof config data is stored. - self.pool = pool + #: RADOS pool where ceph-nvmeof config data is stored (use '.nvmeof' as default). + self.pool = pool or '.nvmeof' #: ``addr`` address of the nvmeof gateway self.addr = addr #: ``addr_map`` per node address map of the nvmeof gateways -- 2.47.3