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

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index c9240f3beabd4476628f2a05809782583102970f..9a87fc6626fa513298148f39161e1656a7e35a38 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1944,7 +1944,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)
@@ -2058,7 +2058,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}'
                 )