From e97259aa6af39d8119c003e912f2dc10a6f72689 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Nov 2019 11:29:12 -0600 Subject: [PATCH] mgr/ssh: 'profile ...' not 'allow profile ...' Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index a9ca76e6bbcfa..5d9a2f53c4b81 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -793,8 +793,8 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): 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'], + 'caps': ['mon', 'profile crash', + 'mgr', 'profile crash'], }) j = json.dumps({ @@ -915,7 +915,7 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): ret, keyring, err = self.mon_command({ 'prefix': 'auth get-or-create', 'entity': 'mgr.%s' % name, - 'caps': ['mon', 'allow profile mgr', + 'caps': ['mon', 'profile mgr', 'osd', 'allow *', 'mds', 'allow *'], }) @@ -1020,7 +1020,7 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): ret, keyring, err = self.mon_command({ 'prefix': 'auth get-or-create', 'entity': 'mds.' + mds_id, - 'caps': ['mon', 'allow profile mds', + 'caps': ['mon', 'profile mds', 'osd', 'allow rwx', 'mds', 'allow'], }) @@ -1124,7 +1124,7 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): ret, keyring, err = self.mon_command({ 'prefix': 'auth get-or-create', 'entity': 'client.rbd-mirror.' + daemon_id, - 'caps': ['mon', 'allow profile rbd-mirror', + 'caps': ['mon', 'profile rbd-mirror', 'osd', 'profile rbd'], }) return self._create_daemon('rbd-mirror', daemon_id, host, keyring) -- 2.39.5