Merge "Fix Openstack topology discovery for Python 2"

This commit is contained in:
Zuul 2019-10-10 14:29:54 +00:00 committed by Gerrit Code Review
commit ad6cfba955

@ -349,8 +349,8 @@ class OpenStackTopology(tobiko.SharedFixture):
except (netaddr.AddrFormatError, ValueError): except (netaddr.AddrFormatError, ValueError):
try: try:
addrinfo = socket.getaddrinfo( addrinfo = socket.getaddrinfo(
host=obj, port=22, obj, 22, 0, 0,
flags=(socket.AI_CANONNAME | socket.IPPROTO_TCP)) socket.AI_CANONNAME | socket.IPPROTO_TCP)
except socket.gaierror: except socket.gaierror:
ips = tobiko.select([]) ips = tobiko.select([])
else: else: