From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 7 Aug 2020 09:24:52 +0000 (+0200)
Subject: mgr/cephadm: _get_config_and_keyring: `host` is required now
X-Git-Tag: v15.2.5~26^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31e3665ba655564dbac274b1e266ddd83ae5ff6b;p=ceph.git

mgr/cephadm: _get_config_and_keyring: `host` is required now

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6105d1ba4c94e1278bf38896ad467a5cf7e5b92b)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index b9c8ca0bdc3c..74624085dc50 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1848,10 +1848,10 @@ you may want to run:
                 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)
diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index 20282e5720c8..92cb32dbcb26 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -20,7 +20,7 @@ ServiceSpecs = TypeVar('ServiceSpecs', bound=ServiceSpec)
 
 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,
@@ -34,7 +34,7 @@ class CephadmDaemonSpec(Generic[ServiceSpecs]):
 
         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
diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 354529885600..33ce52e946bc 100644
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -64,7 +64,10 @@ class NFSService(CephadmService):
         cephadm_config.update(
             self.mgr._get_config_and_keyring(
                 daemon_type, daemon_id,
-                keyring=keyring))
+                keyring=keyring,
+                host=host
+            )
+        )
 
         return cephadm_config, deps