From 5ab16851ecf84bb3e464403daa80dfd297f1befe Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 6 May 2025 09:01:43 -0400 Subject: [PATCH] Treat '' as equivalent to unset for ipv{}_method Since it's a really difficult distiction between blank and unset, make sure this is treated the same. --- confluent_server/confluent/netutil.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/confluent_server/confluent/netutil.py b/confluent_server/confluent/netutil.py index dbd0859d..2e580624 100644 --- a/confluent_server/confluent/netutil.py +++ b/confluent_server/confluent/netutil.py @@ -575,6 +575,8 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None, cfgdata[srvkey] = socket.inet_ntop(fam, svrip) for candidate in cfgbyname: ipmethod = cfgbyname[candidate].get('ipv{}_method'.format(nver), 'static') + if not ipmethod: + ipmethod = 'static' if ipmethod == 'dhcp': dhcprequested = True continue