From d5aba1ec65a0ca49c6dbb1bb8975e5209cb020b3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 10 May 2021 09:04:03 -0400 Subject: [PATCH] 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 --- src/pybind/mgr/cephadm/schedule.py | 3 --- src/pybind/mgr/cephadm/serve.py | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py index dbe723875049..305c117f7476 100644 --- a/src/pybind/mgr/cephadm/schedule.py +++ b/src/pybind/mgr/cephadm/schedule.py @@ -302,9 +302,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 e92da1f9fbe2..00755a93a07a 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -594,13 +594,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( -- 2.47.3