diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index ef74d91074..b6cf191b28 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -387,8 +387,8 @@ class CredentialType(CommonModelNameNotUnique): ENV_BLACKLIST = set(( 'VIRTUAL_ENV', 'PATH', 'PYTHONPATH', 'PROOT_TMP_DIR', 'JOB_ID', 'INVENTORY_ID', 'INVENTORY_SOURCE_ID', 'INVENTORY_UPDATE_ID', - 'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'TOWER_HOST', - 'AWX_HOST', 'MAX_EVENT_RES', 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', + 'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'MAX_EVENT_RES', + 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', 'JOB_CALLBACK_DEBUG', 'INVENTORY_HOSTVARS', 'FACT_QUEUE', )) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b403baff9a..e0432ae3cf 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1039,8 +1039,6 @@ class RunJob(BaseTask): env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display' env['REST_API_URL'] = settings.INTERNAL_API_URL env['REST_API_TOKEN'] = job.task_auth_token or '' - env['TOWER_HOST'] = settings.TOWER_URL_BASE - env['AWX_HOST'] = settings.TOWER_URL_BASE env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE env['CALLBACK_CONNECTION'] = settings.BROKER_URL env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else ''