From 1ebf115f8580f0cd2aceccda6615e396df113c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 14 May 2020 08:33:16 +0200 Subject: [PATCH] Use /32 netmask for VIPs Prior to commit c712355e4bae4ef2fc1b83e5603c0364dbd50a78 KeepaliveD created the VIP addresses. KeepaliveD created the VIPs with /32 netmask, when moving the VIPs to the DeployedServerPortMap and adding them to the br-ctlplane interface the netmask of the ctlplane subnet was used (typically /24). The result is a routing table that potentially uses the incorrect device for traffic when the public VIP is not on in the ctlplane subnet. This change hard-codes the netmask for the VIP addresses to /32. blueprint replace-keepalived-undercloud Closes-Bug: #1878101 Change-Id: I873e925d2250677f25b9ae51ed0b87bd1b8e6b32 --- net-config-standalone.j2.yaml | 4 ++-- net-config-undercloud.j2.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-config-standalone.j2.yaml b/net-config-standalone.j2.yaml index d0d183398d..7f1c4860df 100644 --- a/net-config-standalone.j2.yaml +++ b/net-config-standalone.j2.yaml @@ -135,7 +135,7 @@ resources: list_join: - / - - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]} - - {str_split: ['/', {get_param: [DeployedServerPortMap, 'control_virtual_ip', subnets, 0, cidr]}, 1]} + - '32' - if: - public_virtual_ip_unset @@ -144,7 +144,7 @@ resources: list_join: - / - - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]} - - {str_split: ['/', {get_param: [DeployedServerPortMap, 'public_virtual_ip', subnets, 0, cidr]}, 1]} + - '32' routes: {get_param: ControlPlaneStaticRoutes} members: - type: interface diff --git a/net-config-undercloud.j2.yaml b/net-config-undercloud.j2.yaml index e937588459..79c0d04325 100644 --- a/net-config-undercloud.j2.yaml +++ b/net-config-undercloud.j2.yaml @@ -130,7 +130,7 @@ resources: list_join: - / - - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]} - - {str_split: ['/', {get_param: [DeployedServerPortMap, 'control_virtual_ip', subnets, 0, cidr]}, 1]} + - '32' - if: - public_virtual_ip_unset @@ -139,7 +139,7 @@ resources: list_join: - / - - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]} - - {str_split: ['/', {get_param: [DeployedServerPortMap, 'public_virtual_ip', subnets, 0, cidr]}, 1]} + - '32' routes: {get_param: ControlPlaneStaticRoutes} members: - type: interface