From: Michael Fritch <mfritch@suse.com>
Date: Mon, 10 May 2021 19:49:37 +0000 (-0600)
Subject: cephadm: remove `verify-prereqs` subcommand
X-Git-Tag: v16.2.5~115^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7981a9d6a42a5930cc7d6ac38b3fcd49f4cd834;p=ceph.git

cephadm: remove `verify-prereqs` subcommand

sysctl settings are now managed per-host, rather than per-daemon

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0d67a3d3609..139db69d205 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6772,16 +6772,6 @@ def command_gather_facts(ctx: CephadmContext):
     host = HostFacts(ctx)
     print(host.dump())
 
-##################################
-
-
-def command_verify_prereqs(ctx: CephadmContext):
-    if ctx.service_type == 'haproxy' or ctx.service_type == 'keepalived':
-        out, err, code = call(
-            ctx, ['sysctl', '-n', 'net.ipv4.ip_nonlocal_bind']
-        )
-        if out.strip() != '1':
-            raise Error('net.ipv4.ip_nonlocal_bind not set to 1')
 
 ##################################
 
@@ -8147,15 +8137,6 @@ def _get_parser():
         help='Maintenance action - enter maintenance, or exit maintenance')
     parser_maintenance.set_defaults(func=command_maintenance)
 
-    parser_verify_prereqs = subparsers.add_parser(
-        'verify-prereqs',
-        help='verify system prerequisites for a given service are met on this host')
-    parser_verify_prereqs.set_defaults(func=command_verify_prereqs)
-    parser_verify_prereqs.add_argument(
-        '--daemon-type',
-        required=True,
-        help='service type of service to whose prereqs will be checked')
-
     return parser