cmueller/ansible
1
0
Fork 0
Code Issues Pull requests 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
commit e2d1b5aac2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup
View file

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