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

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

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 cb4c84975a948aa74cc38cf61d7fc653bda4cada..2eb31d9170102af7c64621736d6f0fd0dca05546 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -887,7 +887,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 5334020eb334cf6b136c9e438e7e9018a99cd670..65b1e08ac7f3e70bf51a6390fffbb745b56f07c3 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,