deps.append(dd.name())
return sorted(deps)
- def _get_config_and_keyring(self, daemon_type, daemon_id, host=None,
+ def _get_config_and_keyring(self, daemon_type, daemon_id, host,
keyring=None,
extra_ceph_config=None):
- # type: (str, str, Optional[str], Optional[str], Optional[str]) -> Dict[str, Any]
+ # type: (str, str, str, Optional[str], Optional[str]) -> Dict[str, Any]
# keyring
if not keyring:
ename = utils.name_to_auth_entity(daemon_type, daemon_id, host=host)
class CephadmDaemonSpec(Generic[ServiceSpecs]):
# typing.NamedTuple + Generic is broken in py36
- def __init__(self, host, daemon_id,
+ def __init__(self, host: str, daemon_id,
spec: Optional[ServiceSpecs]=None,
network: Optional[str]=None,
keyring: Optional[str]=None,
Would be great to have a consistent usage where all properties are set.
"""
- self.host = host
+ self.host: str = host
self.daemon_id = daemon_id
daemon_type = daemon_type or (spec.service_type if spec else None)
assert daemon_type is not None
cephadm_config.update(
self.mgr._get_config_and_keyring(
daemon_type, daemon_id,
- keyring=keyring))
+ keyring=keyring,
+ host=host
+ )
+ )
return cephadm_config, deps