From: Sage Weil <sage@newdream.net>
Date: Mon, 25 Oct 2021 20:00:24 +0000 (-0400)
Subject: mgr/cephadm: fix keyring when updating caps
X-Git-Tag: v18.0.0~39^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be9020a9e0155412a909fe1b52c2bdb0b60878a6;p=ceph.git

mgr/cephadm: fix keyring when updating caps

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index e2cd62aa7cb5..ff9d92679170 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -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: