saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29596 from rallytime/bp-29587

Browse source 
Back-port #29587 to 2015.8
This commit is contained in:
Mike Place 2015-12-10 12:57:18 -07:00
commit ffb54cced7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/network.py
View file

@ -896,7 +896,7 @@ def ip_addrs6(interface=None, include_loopback=False, cidr=None):
addrs = salt.utils.network.ip_addrs6(interface=interface,
include_loopback=include_loopback)
if cidr:
return [i for i in addrs if salt.utils.network.ip_in_subnet(cidr, [i])]
return [i for i in addrs if salt.utils.network.in_subnet(cidr, [i])]
else:
return addrs