Merge pull request #36670 from jackywu/2016.3

fix bug for including loopback addr
This commit is contained in:
Mike Place 2016-09-30 19:21:53 +09:00 committed by GitHub
commit 0aa35596c0

View file

@ -581,7 +581,7 @@ class CkMinions(object):
# Add in possible ip addresses of a locally connected minion
addrs.discard('127.0.0.1')
addrs.discard('0.0.0.0')
addrs.update(set(salt.utils.network.ip_addrs()))
addrs.update(set(salt.utils.network.ip_addrs(include_loopback=include_localhost)))
if subset:
search = subset
else: