summaryrefslogtreecommitdiffstats
path: root/src/pybind/mgr/orchestrator
diff options
context:
space:
mode:
authorbaum <alexander.indenbaum@gmail.com>2024-09-25 10:15:30 +0200
committerGitHub <noreply@github.com>2024-09-25 10:15:30 +0200
commitfa95da9d5a0d41e3edc9f568c674c2c44819bdaf (patch)
treeb1940d5c4620561be3733da9e3fe94a948f883a1 /src/pybind/mgr/orchestrator
parentMerge pull request #59850 from aclamk/wip-aclamk-fix-67911-bdev-multi-label (diff)
parentpybind/mgr/orchestrator/module.py: NvmeofServiceSpec service_id (diff)
downloadceph-fa95da9d5a0d41e3edc9f568c674c2c44819bdaf.tar.xz
ceph-fa95da9d5a0d41e3edc9f568c674c2c44819bdaf.zip
Merge pull request #59925 from baum/NvmeofServiceSpec-service_id
pybind/mgr/orchestrator/module.py: NvmeofServiceSpec service_id
Diffstat (limited to 'src/pybind/mgr/orchestrator')
-rw-r--r--src/pybind/mgr/orchestrator/module.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 9a4bcb71b85..b3b46f66f6c 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -1560,7 +1560,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),
@@ -1887,7 +1887,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),