cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #5040 setup module: do not add primary interface info to the secondary interface data

Browse source
This commit is contained in:
James Tanner 2014-01-02 16:17:24 -05:00
parent 50c600c361
commit e2c7aeca4c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
system/setup
View file

@ -1540,8 +1540,7 @@ class LinuxNetwork(Network):
iface = words[-1] iface = words[-1]
if iface != device: if iface != device:
interfaces[iface] = {} interfaces[iface] = {}
interfaces[iface].update(interfaces[device]) if not secondary and "ipv4_secondaries" not in interfaces[iface]:
if "ipv4_secondaries" not in interfaces[iface]:
interfaces[iface]["ipv4_secondaries"] = [] interfaces[iface]["ipv4_secondaries"] = []
if not secondary or "ipv4" not in interfaces[iface]: if not secondary or "ipv4" not in interfaces[iface]:
interfaces[iface]['ipv4'] = {'address': address, interfaces[iface]['ipv4'] = {'address': address,
@ -1553,6 +1552,15 @@ class LinuxNetwork(Network):
'netmask': netmask, 'netmask': netmask,
'network': network, 'network': network,
}) })
# add this secondary IP to the main device
if secondary:
interfaces[device]["ipv4_secondaries"].append({
'address': address,
'netmask': netmask,
'network': network,
})
# If this is the default address, update default_ipv4 # If this is the default address, update default_ipv4
if 'address' in default_ipv4 and default_ipv4['address'] == address: if 'address' in default_ipv4 and default_ipv4['address'] == address:
default_ipv4['netmask'] = netmask default_ipv4['netmask'] = netmask