]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: select IPs/interface based on VIP for keepalive conf
authorAdam King <adking@redhat.com>
Tue, 1 Aug 2023 20:32:06 +0000 (16:32 -0400)
committerAdam King <adking@redhat.com>
Tue, 5 Mar 2024 15:39:49 +0000 (10:39 -0500)
commit738d82a470457f373bab79881154193806fb175f
treeab1c49a71fb0899a9d8d251e0ec3606c2721aab0
parent7b464252f50f912b6bddd9129ce15a2a898ee7de
mgr/cephadm: select IPs/interface based on VIP for keepalive conf

We need to make sure the keepalive conf sets
the unicast src and peer IPs to be the ones
in the same subnet as the VIP we're setting up,
as well as specify the correct interface. Otherwise,
the keepalive daemons don't speak to each other
properly and all end up going into MASTER state.

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

Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/templates/services/ingress/keepalived.conf.j2
src/pybind/mgr/cephadm/tests/test_services.py