From e1612d048a102a716aaa8b5d0d91a45525828664 Mon Sep 17 00:00:00 2001 From: Alexander Indenbaum Date: Mon, 23 Sep 2024 08:47:47 +0000 Subject: [PATCH] pybind/mgr/orchestrator/module.py: NvmeofServiceSpec service_id - make service_id better alligned with default/empty group (https://github.com/ceph/ceph/commit/f6d552d7c777f1160545188dcffa6b685b05ca8a) - fix service_id in nvmeof daemon add Signed-off-by: Alexander Indenbaum --- src/pybind/mgr/orchestrator/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index a962d055b2c..681bb32654e 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -1548,7 +1548,7 @@ Usage: raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage') spec = NvmeofServiceSpec( - service_id='nvmeof', + service_id=f'{pool}.{group}' if group else pool, pool=pool, group=group, placement=PlacementSpec.from_string(placement), @@ -1875,7 +1875,7 @@ Usage: raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage') spec = NvmeofServiceSpec( - service_id=f'{pool}.{group}', + service_id=f'{pool}.{group}' if group else pool, pool=pool, group=group, placement=PlacementSpec.from_string(placement), -- 2.47.3