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

Fix 'wait_for' doesn't work with ipv6only host

Browse source
This commit is contained in:
Andrey Trubachev 2015-01-03 10:32:27 +03:00 committed by Matt Clay
parent 8b60dd349d
commit c55187ff42
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/utilities/logic/wait_for.py
View file

@ -362,10 +362,8 @@ def main():
except IOError: except IOError:
break break
elif port: elif port:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(connect_timeout)
try: try:
s.connect( (host, port) ) s = socket.create_connection( (host, port), connect_timeout)
s.shutdown(socket.SHUT_RDWR) s.shutdown(socket.SHUT_RDWR)
s.close() s.close()
time.sleep(1) time.sleep(1)
@ -410,10 +408,8 @@ def main():
elapsed = datetime.datetime.now() - start elapsed = datetime.datetime.now() - start
module.fail_json(msg="Failed to stat %s, %s" % (path, e.strerror), elapsed=elapsed.seconds) module.fail_json(msg="Failed to stat %s, %s" % (path, e.strerror), elapsed=elapsed.seconds)
elif port: elif port:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(connect_timeout)
try: try:
s.connect( (host, port) ) s = socket.create_connection( (host, port), connect_timeout)
if search_regex: if search_regex:
data = '' data = ''
matched = False matched = False