From: Michael Fritch <mfritch@suse.com>
Date: Wed, 12 May 2021 23:27:50 +0000 (-0600)
Subject: cephadm: add HAProxy sysctl settings
X-Git-Tag: v16.2.5~115^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=652d5c2fef0014afc499c35ae9d7996c40941d37;p=ceph.git

cephadm: add HAProxy sysctl settings

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c705f96b769..0d67a3d3609 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -746,6 +746,13 @@ class HAproxy(object):
         mounts[os.path.join(data_dir, 'haproxy')] = '/var/lib/haproxy'
         return mounts
 
+    @staticmethod
+    def get_sysctl_settings() -> List[str]:
+        return [
+            '# IP forwarding',
+            'net.ipv4.ip_forward = 1',
+        ]
+
 ##################################
 
 
@@ -2972,6 +2979,8 @@ def install_sysctl(ctx: CephadmContext, fsid: str, daemon_type: str) -> None:
 
     if daemon_type == 'osd':
         lines = OSD.get_sysctl_settings()
+    elif daemon_type == 'haproxy':
+        lines = HAproxy.get_sysctl_settings()
     elif daemon_type == 'keepalived':
         lines = Keepalived.get_sysctl_settings()