mgr/cephadm/schedule: fix filter message

This is now only used when scheduling mons.  (Units now enable the kernel
features needed instead of checking for them during placement.)  Move the
message to the filter itself.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d5aba1ec65a0ca49c6dbb1bb8975e5209cb020b3)

diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py
index 92ff8f999da3f9744ee5c7c82dba9c282e488264..c583bfaa5268032b7e419107579845cc9e197d9c 100644 (file)
--- a/src/pybind/mgr/cephadm/schedule.py
+++ b/src/pybind/mgr/cephadm/schedule.py
@@ -303,9 +303,6 @@ class HostAssignment(object):
             for h in old:
                 if self.filter_new_host(h.hostname):
                     ls.append(h)
-                else:
-                    logger.info(
-                        f"Filtered out host {h.hostname}: could not verify host allowed virtual ips")
             if len(old) > len(ls):
                 logger.debug('Filtered %s down to %s' % (old, ls))
 

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 3206d104916638592c7bb11d1eef41707d67265a..9b0e82919331ed4c328af97c659bafec1041c2ad 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -597,13 +597,15 @@ class CephadmServe:
 
         def matches_network(host):
             # type: (str) -> bool
-            if len(public_networks) == 0:
-                return False
             # make sure we have 1 or more IPs for any of those networks on that
             # host
             for network in public_networks:
                 if len(self.mgr.cache.networks[host].get(network, [])) > 0:
                     return True
+            self.log.info(
+                f"Filtered out host {host}: does not belong to mon public_network"
+                f" ({','.join(public_networks)})"
+            )
             return False
 
         ha = HostAssignment(