From: Sage Weil <sage@redhat.com>
Date: Sat, 5 Oct 2019 19:24:06 +0000 (-0500)
Subject: mgr/ssh: pass crash agent keyring to deploy
X-Git-Tag: v15.1.0~1269^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=591cffb69a2ce908c3d711a83c501be0d92434ff;p=ceph.git

mgr/ssh: pass crash agent keyring to deploy

...and adjust argument name

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 96334da55eba..c6d0b003fca2 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -546,16 +546,24 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             })
             self.log.debug('config %s' % config)
 
+            ret, crash_keyring, err = self.mon_command({
+                'prefix': 'auth get-or-create',
+                'entity': 'client.crash.%s' % host,
+                'caps': ['mon', 'allow profile crash',
+                         'mgr', 'allow profile crash'],
+            })
+
             j = json.dumps({
                 'config': config,
                 'keyring': keyring,
+                'crash_keyring': crash_keyring,
             })
 
             out, code = self._run_ceph_daemon(
                 host, name, 'deploy',
                 [
                     '--name', name,
-                    '--config-and-keyring', '-',
+                    '--config-and-keyrings', '-',
                 ] + extra_args,
                 stdin=j)
             self.log.debug('create_daemon code %s out %s' % (code, out))