Addressing reviewers comments

Signed-off-by: Redouane Kachach <[email protected]>

Author: rkachach

src/cephadm/cephadm.py

@@ -1041,10 +1041,10 @@ def get_container_binds():
 
     @staticmethod
     def get_version(ctx: CephadmContext, container_id: str) -> Optional[str]:
-        out, err, ret = call_throws(ctx, [
-            ctx.container_engine.path, 'inspect',
-            '--format', '{{index .Config.Labels "io.ceph.version"}}',
-            ctx.image])
+        out, err, ret = call(ctx,
+                             [ctx.container_engine.path, 'inspect',
+                              '--format', '{{index .Config.Labels "io.ceph.version"}}',
+                              ctx.image])
         version = None
         if ret == 0:
             version = out.strip()
@@ -4111,7 +4111,7 @@ def _write(conf: Path, lines: List[str]) -> None:
         lines = HAproxy.get_sysctl_settings()
     elif daemon_type == 'keepalived':
         lines = Keepalived.get_sysctl_settings()
-    elif daemon_type == 'nvmeof':
+    elif daemon_type == CephNvmeof.daemon_type:
         lines = CephNvmeof.get_sysctl_settings()
     lines = filter_sysctl_settings(ctx, lines)
 

src/pybind/mgr/cephadm/module.py

@@ -2289,7 +2289,7 @@ def daemon_action(self, action: str, daemon_name: str, image: Optional[str] = No
 
         if action == 'rotate-key':
             if d.daemon_type not in ['mgr', 'osd', 'mds',
-                                     'rgw', 'crash', 'nfs', 'rbd-mirror', 'iscsi', 'nvmeof']:
+                                     'rgw', 'crash', 'nfs', 'rbd-mirror', 'iscsi']:
                 raise OrchestratorError(
                     f'key rotation not supported for {d.daemon_type}'
                 )
@@ -2664,8 +2664,6 @@ def get_daemon_names(daemons: List[str]) -> List[str]:
                 deps = [self.iscsi_service.get_trusted_ips(iscsi_spec)]
             else:
                 deps = [self.get_mgr_ip()]
-        elif daemon_type == 'nvmeof':
-            deps = []  # TODO(redo)
         elif daemon_type == 'prometheus':
             # for prometheus we add the active mgr as an explicit dependency,
             # this way we force a redeploy after a mgr failover

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

@@ -1,5 +1,4 @@
 import errno
-import json
 import logging
 from typing import List, cast, Optional
 
@@ -47,7 +46,7 @@ def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonD
         daemon_spec.keyring = keyring
         daemon_spec.extra_files = {'ceph-nvmeof.conf': gw_conf}
         daemon_spec.final_config, daemon_spec.deps = self.generate_config(daemon_spec)
-        daemon_spec.deps = []  # TODO: which gw parameters will require a reconfig?
+        daemon_spec.deps = []
         return daemon_spec
 
     def config_dashboard(self, daemon_descrs: List[DaemonDescription]) -> None:
@@ -79,25 +78,8 @@ def post_remove(self, daemon: DaemonDescription, is_failed_deploy: bool) -> None
         Called after the daemon is removed.
         """
         logger.debug(f'Post remove daemon {self.TYPE}.{daemon.daemon_id}')
-
         # TODO: remove config for dashboard nvmeof gateways if any
-        # needed to know if we have ssl stuff for nvmeof in ceph config
-        nvmeof_config_dict = {}
-        ret, nvmeof_config, err = self.mgr.mon_command({
-            'prefix': 'config-key dump',
-            'key': 'nvmeof',
-        })
-        if nvmeof_config:
-            nvmeof_config_dict = json.loads(nvmeof_config)
-
-        # remove nvmeof cert and key from ceph config
-        for nvmeof_key, value in nvmeof_config_dict.items():
-            if f'nvmeof/client.{daemon.name()}/' in nvmeof_key:
-                ret, out, err = self.mgr.mon_command({
-                    'prefix': 'config-key rm',
-                    'key': nvmeof_key,
-                })
-                logger.info(f'{nvmeof_key} removed from ceph config')
+        # and any certificates being used for mTLS
 
     def purge(self, service_name: str) -> None:
         """Removes configuration