mirror of
https://github.com/ansible/awx.git
synced 2026-05-09 18:37:36 -02:30
Numerous model-related updates and supporing changes, including:
- Add variables field on Host/Group models and remove separate VariableData model. - Add data migrations for existing variable data. - Update views, serializers and tests to keep roughly the same API interface for variable data. - Add has_active_failures properties on Group/Host models to provide indication of last job status. - Add job_tags field on JobTemplate/Job models to specify tags to ansible-playbook. - Add host_config_key field to JobTemplate model for use by empheral hosts. - Add job_args, job_cwd and job_env fields to Job model to capture more info from running the job. - Add failed flag on JobHostSummary model. - Add play/task fields on JobEvent model to capture new context variables from callback. - Add parent field on JobEvent model to capture hierarchy of job events. - Add hosts field on JobEvent model to capture all hosts associated with the event (especially useful for parent events in the hierarchy). - Removed existing Tag model, replace with django-taggit instead. - Removed existing AuditLog model, replacement TBD.
This commit is contained in:
@@ -124,6 +124,8 @@ class RunJob(Task):
|
||||
args.append('-%s' % ('v' * min(3, job.verbosity)))
|
||||
if job.extra_vars:
|
||||
args.extend(['-e', job.extra_vars])
|
||||
if job.job_tags:
|
||||
args.extend(['-t', job.job_tags])
|
||||
args.append(job.playbook) # relative path to project.local_path
|
||||
ssh_key_path = kwargs.get('ssh_key_path', '')
|
||||
if ssh_key_path:
|
||||
@@ -192,6 +194,8 @@ class RunJob(Task):
|
||||
raise RuntimeError('project local_path %s cannot be found' %
|
||||
project.local_path)
|
||||
env = self.build_env(job, **kwargs)
|
||||
job = self.update_job(job_pk, job_args=args, job_cwd=cwd,
|
||||
job_env=env)
|
||||
status, stdout = self.run_pexpect(job_pk, args, cwd, env,
|
||||
kwargs['passwords'])
|
||||
except Exception:
|
||||
|
||||
Reference in New Issue
Block a user