mgr/cephadm: Handled stick table for ipv6 setup, also removed stick table expiry

Fixes: https://tracker.ceph.com/issues/74970
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

diff --git a/src/pybind/mgr/cephadm/services/ingress.py b/src/pybind/mgr/cephadm/services/ingress.py
index 59288256aa5f81110feab511601bb4625ff5ba66..be4f2119ecc0de51e4da5225d579a9ac1d5cc3ab 100644 (file)
--- a/src/pybind/mgr/cephadm/services/ingress.py
+++ b/src/pybind/mgr/cephadm/services/ingress.py
@@ -5,6 +5,7 @@ import string
 from typing import List, Dict, Any, Tuple, cast, Optional, TYPE_CHECKING
 
 from ceph.deployment.service_spec import ServiceSpec, IngressSpec, MonitorCertSource
+from ceph.deployment.utils import is_ipv6
 from mgr_util import build_url
 from cephadm import utils
 from orchestrator import OrchestratorError, DaemonDescription
@@ -275,6 +276,7 @@ class IngressService(CephService):
                 'v4v6_flag': v4v6_flag,
                 'monitor_ssl_file': monitor_ssl_file,
                 'peer_hosts': peer_hosts,
+                'is_ipv6': is_ipv6(ip)
             }
         )
         config_files = {

diff --git a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
index eb506436da3276afdacdad851c423f453786d513..6d00f4e975f1a5781c8a0cf1b271f6281c30d443 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
+++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
@@ -96,7 +96,12 @@ backend backend
     mode        tcp
     balance     roundrobin
     {% if backend_spec.service_type == 'nfs' %}
-    stick-table type ip size 1m expire 2h store server_id peers haproxy_peers
+    {% if is_ipv6 or v4v6_flag %}
+    stick-table type ipv6 size 1m store server_id peers haproxy_peers
+    {% endif %}
+    {% if not is_ipv6 or v4v6_flag %}
+    stick-table type ip size 1m store server_id peers haproxy_peers
+    {% endif %}
     stick match src
     stick store-request src
     option tcp-check

diff --git a/src/pybind/mgr/cephadm/tests/services/test_ingress.py b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
index 869bb160079f6f5ec4a59a813f009bdbd784ec8d..e3bef3d45445e74b44224de8624143623fa2e462 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/services/test_ingress.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
@@ -126,7 +126,7 @@ class TestIngressService:
             'backend backend\n'
             '    mode        tcp\n'
             '    balance     roundrobin\n'
-            '    stick-table type ip size 1m expire 2h store server_id peers haproxy_peers\n'
+            '    stick-table type ip size 1m store server_id peers haproxy_peers\n'
             '    stick match src\n'
             '    stick store-request src\n'
             '    option tcp-check\n'
@@ -1168,7 +1168,7 @@ class TestIngressService:
             'backend backend\n'
             '    mode        tcp\n'
             '    balance     roundrobin\n'
-            '    stick-table type ip size 1m expire 2h store server_id peers haproxy_peers\n'
+            '    stick-table type ip size 1m store server_id peers haproxy_peers\n'
             '    stick match src\n'
             '    stick store-request src\n'
             '    option tcp-check\n'