From 95934d9b673403c6d7635ccc9625acdd11c3c162 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 12 Sep 2013 13:41:04 -0400 Subject: [PATCH] Changed project updates to use -v instead of -vvv. --- awx/main/tasks.py | 5 ++++- awx/main/tests/projects.py | 3 ++- awx/settings/local_settings.py.example | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index cf2d45e3a8..a844edc6b1 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -500,7 +500,10 @@ class RunProjectUpdate(BaseTask): optionally using ssh-agent for public/private key authentication. ''' args = ['ansible-playbook', '-i', 'localhost,'] - args.append('-%s' % ('v' * 3)) + if getattr(settings, 'PROJECT_UPDATE_VVV', False): + args.append('-vvv') + else: + args.append('-v') project = project_update.project scm_url, extra_vars = self._build_scm_url_extra_vars(project_update, **kwargs) diff --git a/awx/main/tests/projects.py b/awx/main/tests/projects.py index 17276c3537..18bdc1b993 100644 --- a/awx/main/tests/projects.py +++ b/awx/main/tests/projects.py @@ -622,7 +622,8 @@ class ProjectsTest(BaseTest): @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, ANSIBLE_TRANSPORT='local', - PROJECT_UPDATE_IDLE_TIMEOUT=30) + PROJECT_UPDATE_IDLE_TIMEOUT=30, + PROJECT_UPDATE_VVV=True) class ProjectUpdatesTest(BaseTransactionTest): def setUp(self): diff --git a/awx/settings/local_settings.py.example b/awx/settings/local_settings.py.example index f4de165e69..c477465596 100644 --- a/awx/settings/local_settings.py.example +++ b/awx/settings/local_settings.py.example @@ -68,6 +68,9 @@ REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST'] # the celery task. #AWX_TASK_ENV['FOO'] = 'BAR' +# If set, uses -vvv for project updates instead of just -v for more output. +# PROJECT_UPDATE_VVV=True + ############################################################################### # EMAIL SETTINGS ###############################################################################