]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0aca9e2) | patch
mgr/cephadm: fix get_keyring_with_caps
authorSage Weil <sage@newdream.net>
Fri, 12 Mar 2021 16:15:35 +0000 (10:15 -0600)
committerSage Weil <sage@newdream.net>
Tue, 16 Mar 2021 12:56:18 +0000 (07:56 -0500)
commit742d844f22f36ab955851e9ceb7a180c56378ee8
treef31ac3b65d38cfca6ea91c4044d52421fbbbb70etree | snapshot
parent0aca9e22fa83e228c88ab23d58140e911e2a8a55commit | diff
mgr/cephadm: fix get_keyring_with_caps

1- Pass caps to 'auth get-or-create'
2- Only try 'auth caps' if the get-or-create failed

Note that the 'auth caps' step can fail if upgrading from 15.2.0 since
'profile mgr' didn't include 'auth caps' until 15.2.1.  We're not
addressing that for now...

Fixes: 7c0d532f3a4839f4199a13773fb5fa8b6fb3f183
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 6127d7f20bc8a6ad02d8ea144584eaf2bfc9590e)
src/pybind/mgr/cephadm/services/cephadmservice.py diff | blob | history
src/pybind/mgr/cephadm/tests/test_services.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.