diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 53d5cfccb7..2c337bd5f0 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -384,7 +384,7 @@ class CredentialType(CommonModelNameNotUnique): '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', - 'MAX_EVENT_RES', 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', + 'AWX_HOST', '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 0608f1c5bd..e14a5ec0b2 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -953,6 +953,7 @@ class RunJob(BaseTask): 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 '' @@ -1077,20 +1078,27 @@ class RunJob(BaseTask): extra_vars = { 'tower_job_id': job.pk, 'tower_job_launch_type': job.launch_type, + 'awx_job_id': job.pk, + 'awx_job_launch_type': job.launch_type, } if job.project: extra_vars.update({ 'tower_project_revision': job.project.scm_revision, + 'awx_project_revision': job.project.scm_revision, }) if job.job_template: extra_vars.update({ 'tower_job_template_id': job.job_template.pk, 'tower_job_template_name': job.job_template.name, + 'awx_job_template_id': job.job_template.pk, + 'awx_job_template_name': job.job_template.name, }) if job.created_by: extra_vars.update({ 'tower_user_id': job.created_by.pk, 'tower_user_name': job.created_by.username, + 'awx_user_id': job.created_by.pk, + 'awx_user_name': job.created_by.username, }) if job.extra_vars_dict: if kwargs.get('display', False) and job.job_template: