From: Sage Weil <sage@newdream.net>
Date: Thu, 15 Apr 2021 22:22:26 +0000 (-0500)
Subject: mgr/cephadm: remove virtual_ip check during scheduling
X-Git-Tag: v17.1.0~2221^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2382603162ec6785681700134e3c5764bd5aa99f;p=ceph.git

mgr/cephadm: remove virtual_ip check during scheduling

In 2f33c6ebbc8e2a6c3844a6921c857fb0796a1552 we made the keepalived task
set the necessary sysctls  to add a virtual_ip, so we don't need this
check anymore.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index a818029629fb..418cecf6078f 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -544,17 +544,6 @@ class CephadmServe:
             # host
             return len(self.mgr.cache.networks[host].get(public_network, [])) > 0
 
-        def virtual_ip_allowed(host):
-            # type: (str) -> bool
-            # Verify that it is possible to use Virtual IPs in the host
-            try:
-                if self.mgr.cache.facts[host]['kernel_parameters']['net.ipv4.ip_nonlocal_bind'] == '0':
-                    return False
-            except KeyError:
-                return False
-
-            return True
-
         ha = HostAssignment(
             spec=spec,
             hosts=self.mgr._hosts_with_daemon_inventory(),
@@ -562,7 +551,6 @@ class CephadmServe:
             networks=self.mgr.cache.networks,
             filter_new_host=(
                 matches_network if service_type == 'mon'
-                else virtual_ip_allowed if service_type == 'ingress'
                 else None
             ),
             allow_colo=svc.allow_colo(),