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 <tomer.haska@ibm.com>

diff --git a/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py b/src/pybind/mgr/cephadm/tests/services/test_nvmeof.py
index a2e8ef35874fb2e26c7ec6e9e7962e1914278a69..64961e7fa760d554f94c2772b389af0a4e979057 100644 (file)
--- 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 a6963d4dadcb7de0ff0390373979cb68cb339ab2..3979675c7556ad80c4add20735a8e9be191f4f59 100644 (file)
--- 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