]> git.apps.os.sepia.ceph.com Git - ceph-ci.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>
Thu, 31 Aug 2023 17:36:16 +0000 (13:36 -0400)
commit0fa933f392a18c14520e1b8c9eab83971a8151c0
tree36ca654b1f10138a0f1d4294c0367677b1430b91
parentf9ad3ce7997d73f9c6cd3455d9c639578354104f
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