From: Kefu Chai <kchai@redhat.com>
Date: Fri, 1 May 2020 05:02:18 +0000 (+0800)
Subject: Merge pull request #34690 from sebastian-philipp/cephadm-crush-keyring-erro
X-Git-Tag: v16.1.0~2458
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a08ff8194cb892e04314da2dffa0617a3fe37115;p=ceph.git

Merge pull request #34690 from sebastian-philipp/cephadm-crush-keyring-erro

mgr/cephadm: raise, if crash keyring fails

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

a08ff8194cb892e04314da2dffa0617a3fe37115
diff --cc src/pybind/mgr/cephadm/module.py
index 89af9d14b044,c8d1976b6fef..438c56a885c3
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1555,10 -1573,9 +1553,10 @@@ class CephadmOrchestrator(orchestrator.
              if not image:
                  daemon_type = entity.split('.', 1)[0] # type: ignore
                  if daemon_type in CEPH_TYPES or \
 -                        daemon_type == 'nfs':
 +                        daemon_type == 'nfs' or \
 +                        daemon_type == 'iscsi':
                      # get container image
-                     ret, image, err = self.mon_command({
+                     ret, image, err = self.check_mon_command({
                          'prefix': 'config get',
                          'who': utils.name_to_config_section(entity),
                          'key': 'container_image',
@@@ -2159,10 -2205,10 +2159,10 @@@
          return ret_all
  
      def _run_ceph_volume_command(self, host: str, cmd: str) -> Tuple[List[str], List[str], int]:
 -        self._require_hosts(host)
 +        self.inventory.assert_host(host)
  
          # get bootstrap key
-         ret, keyring, err = self.mon_command({
+         ret, keyring, err = self.check_mon_command({
              'prefix': 'auth get',
              'entity': 'client.bootstrap-osd',
          })