]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix keyring when updating caps
authorSage Weil <sage@newdream.net>
Mon, 25 Oct 2021 20:00:24 +0000 (16:00 -0400)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 14 Sep 2022 16:15:57 +0000 (16:15 +0000)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit be9020a9e0155412a909fe1b52c2bdb0b60878a6)

src/pybind/mgr/cephadm/services/cephadmservice.py

index 8028b27c661cac56b9fc2d5dc15f263f951d53a3..14d7e66df5f836dfec90fa5dea054319dfcd0084 100644 (file)
@@ -237,6 +237,14 @@ class CephadmService(metaclass=ABCMeta):
             })
             if err:
                 self.mgr.log.warning(f"Unable to update caps for {entity}")
+
+            # get keyring anyway
+            ret, keyring, err = self.mgr.mon_command({
+                'prefix': 'auth get',
+                'entity': entity,
+            })
+            if err:
+                self.mgr.log.warning(f"Unable to fetch keyring for {entity}")
         return keyring
 
     def _inventory_get_fqdn(self, hostname: str) -> str: