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

Merge pull request #901 from dhozac/setup-ip

Browse source 
Work with tun and p2p interfaces
This commit is contained in:
Michael DeHaan 2012-08-17 17:10:59 -07:00
commit 2b51cf04c7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/setup
View file

@ -498,12 +498,18 @@ class LinuxNetwork(Network):
mtu = words[4] mtu = words[4]
elif words[0].startswith('link/'): elif words[0].startswith('link/'):
iface_type = words[0].split('/')[1] iface_type = words[0].split('/')[1]
if iface_type == 'void': # tun interfaces can have any interface type, but won't have an address
if iface_type in ('void', 'none') or len(words) == 1:
macaddress = 'unknown' macaddress = 'unknown'
else: else:
macaddress = words[1] macaddress = words[1]
elif words[0] == 'inet': elif words[0] == 'inet':
address, netmask_length = words[1].split('/') if '/' in words[1]:
address, netmask_length = words[1].split('/')
else:
# pointopoint interfaces do not have a prefix
address = words[1]
netmask_length = "32"
address_bin = struct.unpack('!L', socket.inet_aton(address))[0] address_bin = struct.unpack('!L', socket.inet_aton(address))[0]
netmask_bin = (1<<32) - (1<<32>>int(netmask_length)) netmask_bin = (1<<32) - (1<<32>>int(netmask_length))