From 86e8baefa758ca16c27dfcf05d92c5544774695c Mon Sep 17 00:00:00 2001 From: Andre Kantek Date: Thu, 18 Apr 2024 08:18:21 -0300 Subject: [PATCH] In SX mark floating IPs as deprecated in dual-stack With the dual-stack feature the system now can have 2 floating IPs per network. In non-SX systems the floating IPs are managed by SM, but not in AIO-SX, this is done via puppet, and it requires to mark floating addresses as deprecated. This change can now export IPv4 and IPv6 addresses to the "platform::network::addresses::address_config" variable Test Plan [PASS] install AIO-SX and check if floating IPs have the correct flags [PASS] in the installation configure dual-stack and check if floating IPs have the correct flags Story: 2011027 Task: 49887 Change-Id: I48d727a05ef46105f984848f24f21f087efc64e2 Signed-off-by: Andre Kantek --- .../sysinv/sysinv/sysinv/puppet/interface.py | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py index 3d27b7402b..1e7e5e6432 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py @@ -1717,20 +1717,13 @@ def generate_unassigned_pxeboot_intf_config(context, config, db_api, def get_address_config(context, iface, addresses): ifname = get_interface_os_ifname(context, iface) - if constants.DUAL_STACK_COMPATIBILITY_MODE: - address = addresses[0] - return { - 'ifname': ifname, - 'address': str(address.address) + '/' + str(address.prefix) - } - else: - address_list = [] - for address in addresses: - address_list.append(str(address.address) + '/' + str(address.prefix)) - return { - 'ifname': ifname, - 'addresses': address_list, - } + address_list = [] + for address in addresses: + address_list.append(str(address.address) + '/' + str(address.prefix)) + return { + 'ifname': ifname, + 'addresses': address_list, + } def generate_address_configs(context, config):