From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Nov 2021 22:03:00 +0000 (-0400)
Subject: mgr/cephadm: add rotate support for rgw, crash, nfs, rbd-mirror, iscsi
X-Git-Tag: v18.0.0~39^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4916fd2a31bd136f62c698c693995c7ea25352b5;p=ceph.git

mgr/cephadm: add rotate support for rgw, crash, nfs, rbd-mirror, iscsi

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2c0e7068bd53..e22ed6ede800 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1993,7 +1993,7 @@ Then run the following:
         self.log.info(f'Rotating authentication key for {daemon_spec.name()}')
         rc, out, err = self.mon_command({
             'prefix': 'auth get-or-create-pending',
-            'entity': daemon_spec.name(),
+            'entity': daemon_spec.entity_name(),
             'format': 'json',
         })
         j = json.loads(out)
@@ -2107,7 +2107,8 @@ Then run the following:
                 f'Unable to schedule redeploy for {daemon_name}: No standby MGRs')
 
         if action == 'rotate-key':
-            if d.daemon_type not in ['mgr', 'osd', 'mds']:
+            if d.daemon_type not in ['mgr', 'osd', 'mds',
+                                     'rgw', 'crash', 'nfs', 'rbd-mirror', 'iscsi']:
                 raise OrchestratorError(
                     f'key rotation not supported for {d.daemon_type}'
                 )