]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix typo with vrrp_interfaces in keepalive setup 61902/head
authorAdam King <adking@redhat.com>
Wed, 5 Feb 2025 22:00:06 +0000 (17:00 -0500)
committerAdam King <adking@redhat.com>
Wed, 19 Feb 2025 15:59:14 +0000 (10:59 -0500)
This was intended to be vrrp_interfaces, the variable actually
used later in the code. Instead, due to a typo, it was setting
a variable that is unused other than in the log line right after
it is set. Issue was introduced in
https://github.com/ceph/ceph/commit/58ddc4e20f7cead1f2594241450f4beb5230c746

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b16fc92155e3f4bbf161610490b579e950584bbf)

src/pybind/mgr/cephadm/services/ingress.py

index a17000cd6327dadbcb4fa42d1b597599cf4b773c..e8f8238cbdc020bb5b6c25aa2f589d4ed7f83c3d 100644 (file)
@@ -351,10 +351,10 @@ class IngressService(CephService):
         else:
             for subnet, ifaces in self.mgr.cache.networks.get(host, {}).items():
                 if subnet == spec.vrrp_interface_network:
-                    vrrp_interface = [list(ifaces.keys())[0]] * len(interfaces)
+                    vrrp_interfaces = [list(ifaces.keys())[0]] * len(interfaces)
                     logger.info(
                         f'vrrp will be configured on {host} interface '
-                        f'{vrrp_interface} (which is in subnet {subnet})'
+                        f'{vrrp_interfaces} (which is in subnet {subnet})'
                     )
                     break
             else: