shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Adding more helpful job extra vars

Browse Source 
* Adds email, first name, last name as extra vars to job launches
* Remove old ad-hoc command extra vars population... use our
  base-class method instead
This commit is contained in:
Matthew Jones 2018-03-13 13:24:03 -04:00
parent dcae4f65b5
commit 45ad94f057
No known key found for this signature in database
GPG Key ID: 76A4C17A97590C1C
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/unified_jobs.py
View File

@ -1364,6 +1364,9 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
for name in ('awx', 'tower'): for name in ('awx', 'tower'):
r['{}_user_id'.format(name)] = self.created_by.pk r['{}_user_id'.format(name)] = self.created_by.pk
r['{}_user_name'.format(name)] = self.created_by.username r['{}_user_name'.format(name)] = self.created_by.username
r['{}_user_email'.format(name)] = self.created_by.email
r['{}_user_first_name'.format(name)] = self.created_by.first_name
r['{}_user_last_name'.format(name)] = self.created_by.last_name
else: else:
wj = self.get_workflow_job() wj = self.get_workflow_job()
if wj: if wj:

13
awx/main/tasks.py
View File

@ -2217,18 +2217,7 @@ class RunAdHocCommand(BaseTask):
if ad_hoc_command.verbosity: if ad_hoc_command.verbosity:
args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity))) args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity)))
# Define special extra_vars for AWX, combine with ad_hoc_command.extra_vars extra_vars = ad_hoc_command.awx_meta_vars()
extra_vars = {
'tower_job_id': ad_hoc_command.pk,
'awx_job_id': ad_hoc_command.pk,
}
if ad_hoc_command.created_by:
extra_vars.update({
'tower_user_id': ad_hoc_command.created_by.pk,
'tower_user_name': ad_hoc_command.created_by.username,
'awx_user_id': ad_hoc_command.created_by.pk,
'awx_user_name': ad_hoc_command.created_by.username,
})
if ad_hoc_command.extra_vars_dict: if ad_hoc_command.extra_vars_dict:
redacted_extra_vars, removed_vars = extract_ansible_vars(ad_hoc_command.extra_vars_dict) redacted_extra_vars, removed_vars = extract_ansible_vars(ad_hoc_command.extra_vars_dict)

6
awx/main/tests/unit/models/test_unified_job_unit.py
View File

@ -93,6 +93,12 @@ class TestMetaVars:
'awx_job_launch_type': 'manual', 'awx_job_launch_type': 'manual',
'awx_user_name': 'joe', 'awx_user_name': 'joe',
'tower_user_name': 'joe', 'tower_user_name': 'joe',
'awx_user_email': '',
'tower_user_email': '',
'awx_user_first_name': '',
'tower_user_first_name': '',
'awx_user_last_name': '',
'tower_user_last_name': '',
'awx_user_id': 47, 'awx_user_id': 47,
'tower_user_id': 47 'tower_user_id': 47
} }