External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add choices for job and ad hoc command verbosity.

Browse Source
This commit is contained in:
Chris Church
2015-04-09 18:55:42 -04:00
parent c61ef0a602
commit aa0c16d726
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/models/ad_hoc_commands.py
View File

@@ -72,6 +72,7 @@ class AdHocCommand(UnifiedJob):
default=0, default=0,
) )
verbosity = models.PositiveIntegerField( verbosity = models.PositiveIntegerField(
choices=VERBOSITY_CHOICES,
blank=True, blank=True,
default=0, default=0,
) )

12
awx/main/models/base.py
View File

@@ -29,7 +29,8 @@ __all__ = ['VarsDictProperty', 'BaseModel', 'CreatedModifiedModel',
'PERM_INVENTORY_ADMIN', 'PERM_INVENTORY_READ', 'PERM_INVENTORY_ADMIN', 'PERM_INVENTORY_READ',
'PERM_INVENTORY_WRITE', 'PERM_INVENTORY_DEPLOY', 'PERM_INVENTORY_SCAN', 'PERM_INVENTORY_WRITE', 'PERM_INVENTORY_DEPLOY', 'PERM_INVENTORY_SCAN',
'PERM_INVENTORY_CHECK', 'PERM_JOBTEMPLATE_CREATE', 'JOB_TYPE_CHOICES', 'PERM_INVENTORY_CHECK', 'PERM_JOBTEMPLATE_CREATE', 'JOB_TYPE_CHOICES',
'PERMISSION_TYPE_CHOICES', 'CLOUD_INVENTORY_SOURCES'] 'PERMISSION_TYPE_CHOICES', 'CLOUD_INVENTORY_SOURCES',
'VERBOSITY_CHOICES']
PERM_INVENTORY_ADMIN = 'admin' PERM_INVENTORY_ADMIN = 'admin'
PERM_INVENTORY_READ = 'read' PERM_INVENTORY_READ = 'read'
@@ -57,6 +58,15 @@ PERMISSION_TYPE_CHOICES = [
CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'custom'] CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'custom']
VERBOSITY_CHOICES = [
(0, '0 (Normal)'),
(1, '1 (Verbose)'),
(2, '2 (More Verbose)'),
(3, '3 (Debug)'),
(4, '4 (Connection Debug)'),
(5, '5 (WinRM Debug)'),
]
class VarsDictProperty(object): class VarsDictProperty(object):
''' '''

1
awx/main/models/jobs.py
View File

@@ -87,6 +87,7 @@ class JobOptions(BaseModel):
default='', default='',
) )
verbosity = models.PositiveIntegerField( verbosity = models.PositiveIntegerField(
choices=VERBOSITY_CHOICES,
blank=True, blank=True,
default=0, default=0,
) )

4
awx/main/tasks.py
View File

@@ -658,7 +658,7 @@ class RunJob(BaseTask):
if job.limit: if job.limit:
args.extend(['-l', job.limit]) args.extend(['-l', job.limit])
if job.verbosity: if job.verbosity:
args.append('-%s' % ('v' * min(3, job.verbosity))) args.append('-%s' % ('v' * min(5, job.verbosity)))
if job.job_tags: if job.job_tags:
args.extend(['-t', job.job_tags]) args.extend(['-t', job.job_tags])
if job.skip_tags: if job.skip_tags:
@@ -1269,7 +1269,7 @@ class RunAdHocCommand(BaseTask):
if ad_hoc_command.forks: # FIXME: Max limit? if ad_hoc_command.forks: # FIXME: Max limit?
args.append('--forks=%d' % ad_hoc_command.forks) args.append('--forks=%d' % ad_hoc_command.forks)
if ad_hoc_command.verbosity: if ad_hoc_command.verbosity:
args.append('-%s' % ('v' * min(3, ad_hoc_command.verbosity))) args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity)))
args.extend(['-m', ad_hoc_command.module_name]) args.extend(['-m', ad_hoc_command.module_name])
args.extend(['-a', ad_hoc_command.module_args]) args.extend(['-a', ad_hoc_command.module_args])