xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-11 08:15:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix use of autodetected plen

Browse Source
This commit is contained in:
Jarrod Johnson 2021-10-27 17:19:22 -04:00
parent 00b22bb18b
commit 5a7f0db899
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/netutil.py
View File

@ -251,7 +251,7 @@ class NetManager(object):
continue
if ipn_on_same_subnet(addr[0], ipn, addr[1], addr[2]):
plen = addr[2]
myattribs['ipv6_address'] += '/64'
myattribs['ipv6_address'] += '/{0}'.format(plen)
if '/' not in myattribs.get('ipv4_address', '/'):
ipn = socket.inet_pton(socket.AF_INET, myattribs['ipv4_address'])
plen = 16
@ -260,7 +260,7 @@ class NetManager(object):
continue
if ipn_on_same_subnet(addr[0], ipn, addr[1], addr[2]):
plen = addr[2]
myattribs['ipv4_address'] += '/'.format(plen)
myattribs['ipv4_address'] += '/{0}'.format(plen)
if 'current_nic' not in myattribs:
myattribs['current_nic'] = False