diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py index 2110bab5da..2df0a07e5e 100644 --- a/awx/main/utils/licensing.py +++ b/awx/main/utils/licensing.py @@ -243,14 +243,23 @@ class Licenser(object): return [] def get_rhsm_subs(self, host, client_id, client_secret): - client = OIDCClient(client_id, client_secret) - subs = client.make_request( - 'GET', - host, - verify=True, - timeout=(31, 31), - ) - + try: + client = OIDCClient(client_id, client_secret) + subs = client.make_request( + 'GET', + host, + verify=True, + timeout=(5, 20), + ) + except requests.RequestException: + logger.warning("Failed to connect to console.redhat.com using Service Account credentials. Falling back to basic auth.") + subs = requests.request( + 'GET', + host, + auth=(client_id, client_secret), + verify=True, + timeout=(5, 20), + ) subs.raise_for_status() subs_formatted = [] for sku in subs.json()['body']: