From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Mar 2021 15:59:46 +0000 (-0500)
Subject: mgr/cephadm: identify iscsi service by the pool
X-Git-Tag: v16.2.0~73^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc4c95b4131fd62cca09d6a27b3dd8190720334c;p=ceph.git

mgr/cephadm: identify iscsi service by the pool

Since we deploy one of these per pool, name the service by the pool.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d8fff6e522d91a56f93c613710e45c232f4450fd)
---

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index cd843ff17003..c96a9995bb55 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -1131,7 +1131,7 @@ Usage:
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = IscsiServiceSpec(
-            service_id='iscsi',
+            service_id=pool,
             pool=pool,
             api_user=api_user,
             api_password=api_password,