From 84411ff9d54d119c9e7040d688d904d607e431bf Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 15 Sep 2020 09:51:07 -0600 Subject: [PATCH] Lower default verbosity for ansible Similar to aef369e7b4d38e4ca7eb158d2878e84a4b93e603 however this only affects the ansible-playbook execution. By default openstack cli sets verbosity to 1 so we are always running ansible-playbook with a -v. This can a consequence on the information returned during execution as we may get extra result data in the output. Change-Id: I4e1cb6658172a7da5ae5198ba55d47de33282975 (cherry picked from commit e8e2ca479faaf96763ba5b27af06a73ebdb5c6c3) --- tripleo_common/actions/ansible.py | 4 ++-- tripleo_common/tests/actions/test_ansible.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index e571c68b1..72227695c 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -340,8 +340,8 @@ class AnsiblePlaybookAction(base.TripleOAction): python_version = sys.version_info.major ansible_playbook_cmd = "ansible-playbook-{}".format(python_version) - if 0 < self.verbosity < 6: - verbosity_option = '-' + ('v' * self.verbosity) + if 1 < self.verbosity < 6: + verbosity_option = '-' + ('v' * (self.verbosity - 1)) command = [ansible_playbook_cmd, verbosity_option, self.playbook] else: diff --git a/tripleo_common/tests/actions/test_ansible.py b/tripleo_common/tests/actions/test_ansible.py index a7181f925..385cb7e41 100644 --- a/tripleo_common/tests/actions/test_ansible.py +++ b/tripleo_common/tests/actions/test_ansible.py @@ -40,7 +40,7 @@ class AnsiblePlaybookActionTest(base.TestCase): self.become = True self.become_user = 'root' self.extra_vars = {"var1": True, "var2": 0} - self.verbosity = 1 + self.verbosity = 2 self.ctx = mock.MagicMock() self.max_message_size = 1024