From: Michael Fritch <mfritch@suse.com>
Date: Tue, 25 Aug 2020 15:26:51 +0000 (-0600)
Subject: mgr/cephadm: use `check_mon_command` util
X-Git-Tag: v15.2.9~122^2~117^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf0bc6f785fefb73161db628d367b8e507243ac0;p=ceph.git

mgr/cephadm: use `check_mon_command` util

rather then checking the retval explicitly

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2f7fef134753f880c54027fbe18d4bf7425098fe)
---

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 2155d9b288b..ac2d525ee3f 100644
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -120,15 +120,12 @@ class NFSService(CephadmService):
 
     def get_or_create_keyring(self, entity: str) -> str:
         logger.info('Create keyring: %s' % entity)
-        ret, keyring, err = self.mgr.mon_command({
+
+        ret, keyring, err = self.mgr.check_mon_command({
             'prefix': 'auth get-or-create',
             'entity': entity,
         })
 
-        if ret != 0:
-            raise OrchestratorError(
-                'Unable to create keyring %s: %s %s'
-                % (entity, ret, err))
         return keyring
 
     def update_keyring_caps(self, entity: str, spec: NFSServiceSpec) -> None:
@@ -137,18 +134,13 @@ class NFSService(CephadmService):
             osd_caps = '%s namespace=%s' % (osd_caps, spec.namespace)
 
         logger.info('Updating keyring caps: %s' % entity)
-        ret, out, err = self.mgr.mon_command({
+        ret, out, err = self.mgr.check_mon_command({
             'prefix': 'auth caps',
             'entity': entity,
             'caps': ['mon', 'allow r',
                      'osd', osd_caps],
         })
 
-        if ret != 0:
-            raise OrchestratorError(
-                'Unable to update keyring caps %s: %s %s'
-                % (entity, ret, err))
-
     def create_rados_config_obj(self,
                                 spec: NFSServiceSpec,
                                 clobber: bool = False) -> None: