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

Merge pull request #10971 from mightydok/debbraoadcastfix

Browse source 
Add missed broadcast address to linux network facts.
This commit is contained in:
Brian Coca 2015-08-06 08:52:55 -04:00
commit 262c75c253
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/facts.py
View file

@ -1880,6 +1880,7 @@ class LinuxNetwork(Network):
if words[0] == 'inet':
if '/' in words[1]:
address, netmask_length = words[1].split('/')
broadcast = words[3]
else:
# pointopoint interfaces do not have a prefix
address = words[1]
@ -1893,6 +1894,7 @@ class LinuxNetwork(Network):
interfaces[iface] = {}
if not secondary and "ipv4" not in interfaces[iface]:
interfaces[iface]['ipv4'] = {'address': address,
'broadcast': broadcast,
'netmask': netmask,
'network': network}
else:
@ -1900,6 +1902,7 @@ class LinuxNetwork(Network):
interfaces[iface]["ipv4_secondaries"] = []
interfaces[iface]["ipv4_secondaries"].append({
'address': address,
'broadcast': broadcast,
'netmask': netmask,
'network': network,
})
@ -1910,12 +1913,14 @@ class LinuxNetwork(Network):
interfaces[device]["ipv4_secondaries"] = []
interfaces[device]["ipv4_secondaries"].append({
'address': address,
'broadcast': broadcast,
'netmask': netmask,
'network': network,
})
# If this is the default address, update default_ipv4
if 'address' in default_ipv4 and default_ipv4['address'] == address:
default_ipv4['broadcast'] = broadcast
default_ipv4['netmask'] = netmask
default_ipv4['network'] = network
default_ipv4['macaddress'] = macaddress