Related #13336 - DNS resolution is preventing awx_collection to work with http[s]_proxy (#13524)

Co-authored-by: Seth Foster <fosterseth@users.noreply.github.com>
This commit is contained in:
Baptiste Agasse
2023-05-24 22:00:07 +02:00
committed by GitHub
parent bac124004f
commit 8957a84738

View File

@@ -17,7 +17,7 @@ import time
import re import re
from json import loads, dumps from json import loads, dumps
from os.path import isfile, expanduser, split, join, exists, isdir from os.path import isfile, expanduser, split, join, exists, isdir
from os import access, R_OK, getcwd from os import access, R_OK, getcwd, environ
try: try:
@@ -131,9 +131,11 @@ class ControllerModule(AnsibleModule):
self.url.hostname.replace(char, "") self.url.hostname.replace(char, "")
# Try to resolve the hostname # Try to resolve the hostname
try: try:
addrinfolist = getaddrinfo(self.url.hostname, self.url.port, proto=IPPROTO_TCP) proxy_env_var_name = "{0}_proxy".format(self.url.scheme)
for family, kind, proto, canonical, sockaddr in addrinfolist: if not environ.get(proxy_env_var_name) and not environ.get(proxy_env_var_name.upper()):
sockaddr[0] addrinfolist = getaddrinfo(self.url.hostname, self.url.port, proto=IPPROTO_TCP)
for family, kind, proto, canonical, sockaddr in addrinfolist:
sockaddr[0]
except Exception as e: except Exception as e:
self.fail_json(msg="Unable to resolve controller_host ({1}): {0}".format(self.url.hostname, e)) self.fail_json(msg="Unable to resolve controller_host ({1}): {0}".format(self.url.hostname, e))