From a32001eb60651c1e9cb67d323926fa241de5995b Mon Sep 17 00:00:00 2001 From: Mat Kowalski Date: Mon, 20 Nov 2023 17:27:24 +0100 Subject: [PATCH] OCPBUGS-23432: Use shorter IP label for keepalived VIP This PR modifies the label used for an IP address assigned by keepalived to not include the name of the interface. This is because the maximum allowed lenght of the label is 15 characters, causing stuff to fail when interface itself has a name longer than 12 characters. With this change the label will always be a simple string of length 3 and will not be susceptible to overflow for long NIC names. Contributes-to: OCPBUGS-23432 --- test/data/keepalived.conf.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/data/keepalived.conf.tmpl b/test/data/keepalived.conf.tmpl index 2364934b..c18c84af 100644 --- a/test/data/keepalived.conf.tmpl +++ b/test/data/keepalived.conf.tmpl @@ -21,7 +21,7 @@ vrrp_instance {{.Cluster.Name}}_API { auth_pass {{.Cluster.Name}}_api_vip } virtual_ipaddress { - {{.Cluster.APIVIP}}/{{.Cluster.VIPNetmask}} label {{.VRRPInterface}}:vip + {{.Cluster.APIVIP}}/{{.Cluster.VIPNetmask}} label vip } track_script { chk_ocp @@ -39,7 +39,7 @@ vrrp_instance {{.Cluster.Name}}_INGRESS { auth_pass {{.Cluster.Name}}_ingress_vip } virtual_ipaddress { - {{.Cluster.IngressVIP}}/{{.Cluster.VIPNetmask}} label {{.VRRPInterface}}:vip + {{.Cluster.IngressVIP}}/{{.Cluster.VIPNetmask}} label vip } track_script { chk_ingress