diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index 9e46f35500..7f52f64c02 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -1328,7 +1328,6 @@ class RunProjectUpdate(BaseTask): 'local_path': os.path.basename(project_update.project.local_path), 'project_path': project_update.get_project_path(check_if_exists=False), # deprecated 'insights_url': settings.INSIGHTS_URL_BASE, - 'oidc_endpoint': settings.INSIGHTS_OIDC_ENDPOINT, 'awx_license_type': get_license().get('license_type', 'UNLICENSED'), 'awx_version': get_awx_version(), 'scm_url': scm_url, diff --git a/awx/playbooks/action_plugins/insights.py b/awx/playbooks/action_plugins/insights.py index b2f8403b64..2d6b563c29 100644 --- a/awx/playbooks/action_plugins/insights.py +++ b/awx/playbooks/action_plugins/insights.py @@ -83,7 +83,6 @@ class ActionModule(ActionBase): password = self._task.args.get('password', None) client_id = self._task.args.get('client_id', None) client_secret = self._task.args.get('client_secret', None) - oidc_endpoint = self._task.args.get('oidc_endpoint', DEFAULT_OIDC_ENDPOINT) session.headers.update( { @@ -93,7 +92,7 @@ class ActionModule(ActionBase): ) if authentication == 'service_account' or (client_id and client_secret): - data = self._obtain_auth_token(oidc_endpoint, client_id, client_secret) + data = self._obtain_auth_token(DEFAULT_OIDC_ENDPOINT, client_id, client_secret) if 'token' not in data: result['failed'] = data['failed'] result['msg'] = data['msg'] diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 43ed5b9f07..399c4fe1fa 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -700,7 +700,6 @@ DISABLE_LOCAL_AUTH = False TOWER_URL_BASE = "https://platformhost" INSIGHTS_URL_BASE = "https://example.org" -INSIGHTS_OIDC_ENDPOINT = "https://sso.example.org/" INSIGHTS_AGENT_MIME = 'application/example' # See https://github.com/ansible/awx-facts-playbooks INSIGHTS_SYSTEM_ID_FILE = '/etc/redhat-access-insights/machine-id'