mgr/cephadm: undefined name 'channel' (F821)

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

diff --git a/src/pybind/mgr/cephadm/remotes.py b/src/pybind/mgr/cephadm/remotes.py
index 9165a65048cc189f43de9f65686b5b11c08350e1..0ad7006831d62eaaf358474547a2507008dd277d 100644 (file)
--- a/src/pybind/mgr/cephadm/remotes.py
+++ b/src/pybind/mgr/cephadm/remotes.py
@@ -27,5 +27,5 @@ def choose_python():
 
 
 if __name__ == '__channelexec__':
-    for item in channel:  # type: ignore
-        channel.send(eval(item))  # type: ignore
+    for item in channel:  # type: ignore # noqa: F821
+        channel.send(eval(item))  # type: ignore # noqa: F821

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index b959060889118eb940541b0cb6dbfe903ee2b2b9..eb78992dea40d72a9d91090913589177d1933725 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -889,7 +889,7 @@ class Orchestrator(object):
         """
         Applies any spec
         """
-        fns: Dict[str, function] = {
+        fns: Dict[str, Callable] = {
             'alertmanager': self.apply_alertmanager,
             'crash': self.apply_crash,
             'grafana': self.apply_grafana,

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 4a277ce266f65d55a1d627916304f4fa2a058406..038fcc42c81961b40721a29f004ddcb240a98e5b 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -14,7 +14,6 @@ ignore =
     E501,
     F401,
     F811,
-    F821,
     F841,
     W291,
     W503,