internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-a10d74f7' of git://github.com/sfromm/ansible into devel

Browse Source 
Conflicts:
	library/setup
This commit is contained in:
Michael DeHaan
2013-04-23 13:52:31 -04:00
parent c601e53fce 471fa6859e
commit 521375a7fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/setup
View File

@@ -1057,7 +1057,7 @@ class LinuxNetwork(Network):
iface = words[-1]
if iface != device:
interfaces[iface] = {}
interfaces[iface].update(self.facts[device])
interfaces[iface].update(interfaces[device])
interfaces[iface]['ipv4'] = {'address': address,
'netmask': netmask,
'network': network}