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

Move salt.utils.ipaddr to salt.ext.ipaddr

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-19 01:41:46 +00:00
parent ffbc38abe3
commit 4c68c327ec
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
COPYING
View file

@ -67,7 +67,7 @@ License: MIT License
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Files: salt/utils/ipaddr.py
Files: salt/ext/ipaddr.py
Copyright: 2007 Google Inc.
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");

0
salt/utils/ipaddr.py → salt/ext/ipaddr.py
View file

6
salt/roster/scan.py
View file

@ -8,7 +8,7 @@ from __future__ import absolute_import
import socket
# Import salt libs
import salt.utils.ipaddr
import salt.ext.ipaddr
def targets(tgt, tgt_type='glob', **kwargs):
@ -36,11 +36,11 @@ class RosterMatcher(object):
addrs = ()
ret = {}
try:
salt.utils.ipaddr.IPAddress(self.tgt)
salt.ext.ipaddr.IPAddress(self.tgt)
addrs = [self.tgt]
except ValueError:
try:
addrs = salt.utils.ipaddr.IPNetwork(self.tgt).iterhosts()
addrs = salt.ext.ipaddr.IPNetwork(self.tgt).iterhosts()
except ValueError:
pass
for addr in addrs: