Merge pull request #2832 from rektide/fix-openvz-venet-ipv6

Fix setup module's handling of venet & unknown ipv6 interfaces
pull/2817/merge
Michael DeHaan 12 years ago
commit 7cd1bc9628

@ -1157,7 +1157,7 @@ class LinuxNetwork(Network):
default_ipv6['scope'] = scope default_ipv6['scope'] = scope
default_ipv6['macaddress'] = macaddress default_ipv6['macaddress'] = macaddress
default_ipv6['mtu'] = interfaces[device]['mtu'] default_ipv6['mtu'] = interfaces[device]['mtu']
default_ipv6['type'] = interfaces[device]['type'] default_ipv6['type'] = interfaces[device].get("type", "unknown")
if not address == '::1': if not address == '::1':
ips['all_ipv6_addresses'].append(address) ips['all_ipv6_addresses'].append(address)

Loading…
Cancel
Save