mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Fix a bug that would add updated control ip address instead of replace
This commit is contained in:
parent
8f4461567d
commit
a789e8bf57
@ -16,5 +16,8 @@ def merge(dbag, ip):
|
|||||||
ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
|
ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
|
||||||
if 'nw_type' not in ip.keys():
|
if 'nw_type' not in ip.keys():
|
||||||
ip['nw_type'] = 'public'
|
ip['nw_type'] = 'public'
|
||||||
dbag.setdefault('eth' + str(ip['nic_dev_id']), []).append( ip )
|
if ip['nw_type'] == 'control':
|
||||||
|
dbag['eth' + str(ip['nic_dev_id'])] = [ ip ]
|
||||||
|
else:
|
||||||
|
dbag.setdefault('eth' + str(ip['nic_dev_id']), []).append( ip )
|
||||||
return dbag
|
return dbag
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user