xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-29 04:50:21 +00:00
Code Issues Projects Releases Wiki Activity

Provide both v4 and v6 in deploycfg

Browse Source 
When implicitly working by lookup, both v4 and v6
were provided, but first match only
on explicit specification.

Correct this discrepency.
This commit is contained in:
Jarrod Johnson 2021-11-04 17:20:49 -04:00
parent df7d34dc28
commit a23d5b9b55
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/netutil.py
View File

@ -395,6 +395,7 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None,
except socket.gaierror:
pass
if myaddrs:
foundaddr = False
candgws = []
candsrvs = []
for myaddr in myaddrs:
@ -434,7 +435,7 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None,
cfgdata['ipv{}_prefix'.format(nver)] = prefix
if candip in (ipbynodename, ip6bynodename):
cfgdata['matchesnodename'] = True
return cfgdata
foundaddr = True
except Exception as e:
cfgdata['error_msg'] = "Error trying to evaluate net.*ipv4_address attribute value '{0}' on {1}: {2}".format(candip, node, str(e))
elif candgw:
@ -442,6 +443,8 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None,
candgwn = socket.inet_pton(fam, inf[-1][0])
if ipn_on_same_subnet(fam, svrip, candgwn, prefix):
candgws.append((fam, candgwn, prefix))
if foundaddr:
return cfgdata
if dhcprequested:
if not cfgdata.get('ipv4_method', None):
cfgdata['ipv4_method'] = 'dhcp'