]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: only check haproxy frontend_port conflicts on VIP
authorAdam King <adking@redhat.com>
Fri, 11 Aug 2023 18:00:31 +0000 (14:00 -0400)
committerAdam King <adking@redhat.com>
Tue, 23 Jul 2024 14:39:13 +0000 (10:39 -0400)
commitdcc2c3a3e96e54b37c43fe2bc9768e52bb21d519
treedb1e9c18b41a2cfd5b6a7d13e6c9af4e84f0afd3
parente6e543bbe7feae471c9f585e280cf68dc2fd6ec3
mgr/cephadm: only check haproxy frontend_port conflicts on VIP

If we know what IP the frontend_port will be binding
to, we can pass that down through the port_ips mapping
so cephadm will only check if that port on that specific
VIP if in use. This allows multiple haproxy daemons
to be bound to the same port on different VIPs on the
same host.

Note that you still must use a different monitor port
for the two different ingress services as that port
is bound to on the actual IP of the host. Only the
frontend port can be the same for haproxies on the
same host as long as the VIP is different.

Fixes: https://tracker.ceph.com/issues/57614
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 640af155986ac85d12367f43ac45b682a9fa9415)

Conflicts:
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/tests/test_services.py