From b3ba675b9ad251f06361c27bf13705b770eb9954 Mon Sep 17 00:00:00 2001 From: Luke Short Date: Mon, 20 Jan 2020 16:16:11 -0500 Subject: [PATCH] Default to zero verbosity when using Ansible. The OpenStack CLI defaults to 1 level of verbosity which was being directly passed to Ansible methods. When the CLI is given "-v", the verbosity level is set to 2. This patch ensures that Ansible will not be verbose by default. This lowers the amount of RAM a default deployment/update/upgrade will use along with lowering log file sizes. Conflicts: tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py tripleoclient/utils.py tripleoclient/v1/overcloud_deploy.py tripleoclient/v1/overcloud_external_update.py tripleoclient/v1/overcloud_external_upgrade.py tripleoclient/workflows/deployment.py Change-Id: Ic59cc6b2b9b979255c10d71e437afa733517e3e1 Signed-off-by: Luke Short (cherry picked from commit 90eee3abc1efca0166b6e5fb05998aa54abcbc05) (cherry picked from commit aef369e7b4d38e4ca7eb158d2878e84a4b93e603) (cherry picked from commit 36cda0a2b549e72de80c3b8fce5ba317a5aafa65) --- .../test_overcloud_ffwd_upgrade.py | 4 ++-- .../tests/v1/overcloud_update/test_overcloud_update.py | 8 ++++---- .../v1/overcloud_upgrade/test_overcloud_upgrade.py | 10 +++++----- tripleoclient/utils.py | 2 +- tripleoclient/v1/overcloud_deploy.py | 5 +++-- tripleoclient/v1/overcloud_ffwd_upgrade.py | 2 +- tripleoclient/v1/overcloud_update.py | 2 +- tripleoclient/v1/overcloud_upgrade.py | 2 +- tripleoclient/workflows/deployment.py | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py b/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py index f99840998..a77a71793 100644 --- a/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py @@ -160,7 +160,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun): playbook=constants.FFWD_UPGRADE_PLAYBOOK, node_user='heat-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -185,7 +185,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun): playbook=constants.FFWD_UPGRADE_PLAYBOOK, node_user='my-user', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', diff --git a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py index 14ec58f8c..1aa0f1914 100644 --- a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py +++ b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py @@ -151,7 +151,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun): playbook='fake-playbook.yaml', node_user='tripleo-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -181,7 +181,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun): playbook=book, node_user='heat-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -210,7 +210,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun): playbook=book, node_user='heat-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -237,7 +237,7 @@ class TestOvercloudUpdateConverge(fakes.TestOvercloudUpdateConverge): # Get the command object to test app_args = mock.Mock() - app_args.verbose_level = 1 + app_args.verbose_level = 0 self.cmd = overcloud_update.UpdateConverge(self.app, app_args) @mock.patch( diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py index 37834df8e..72607208f 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py @@ -165,7 +165,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): playbook='fake-playbook.yaml', node_user='tripleo-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -197,7 +197,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): playbook=book, node_user='heat-admin', skip_tags='validation', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -227,7 +227,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): playbook='fake-playbook.yaml', node_user='heat-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -257,7 +257,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): playbook=book, node_user='heat-admin', skip_tags='', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', @@ -289,7 +289,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): playbook=book, node_user='heat-admin', skip_tags='pre-upgrade,validation', - verbosity=1 + verbosity=0 ) @mock.patch('tripleoclient.workflows.package_update.update_ansible', diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index e9758cc1f..b2e0a652d 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -1067,7 +1067,7 @@ def get_tripleo_ansible_inventory(inventory_file='', def run_update_ansible_action(log, clients, nodes, inventory, playbook, all_playbooks, ssh_user, action=None, skip_tags='', - verbosity='1', workdir='', priv_key=''): + verbosity='0', workdir='', priv_key=''): playbooks = [playbook] if playbook == "all": diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 70af8b49d..69e405ece 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -304,7 +304,7 @@ class DeployOvercloud(command.Command): os.path.abspath(tht_root))) deployment.deploy_and_wait( self.log, self.clients, stack, - stack_name, self.app_args.verbose_level, + stack_name, self.app_args.verbose_level - 1, timeout=timeout, run_validations=run_validations, skip_deploy_identifier=skip_deploy_identifier) @@ -1028,7 +1028,8 @@ class DeployOvercloud(command.Command): parsed_args.overcloud_ssh_user, parsed_args.overcloud_ssh_key, parsed_args.output_dir, - verbosity=self.app_args.verbose_level) + verbosity=( + self.app_args.verbose_level - 1)) # Force fetching of attributes stack.get() diff --git a/tripleoclient/v1/overcloud_ffwd_upgrade.py b/tripleoclient/v1/overcloud_ffwd_upgrade.py index 9251edb73..af76251fb 100644 --- a/tripleoclient/v1/overcloud_ffwd_upgrade.py +++ b/tripleoclient/v1/overcloud_ffwd_upgrade.py @@ -143,7 +143,7 @@ class FFWDUpgradeRun(command.Command): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) oooutils.ffwd_upgrade_operator_confirm(parsed_args.yes, self.log) - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 clients = self.app.client_manager # Run ansible: diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py index 9f122b059..c55aef949 100644 --- a/tripleoclient/v1/overcloud_update.py +++ b/tripleoclient/v1/overcloud_update.py @@ -148,7 +148,7 @@ class UpdateRun(command.Command): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) clients = self.app.client_manager - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 stack = parsed_args.stack # Run ansible: diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py index 880d97d2d..3f505f74b 100644 --- a/tripleoclient/v1/overcloud_upgrade.py +++ b/tripleoclient/v1/overcloud_upgrade.py @@ -197,7 +197,7 @@ class UpgradeRun(command.Command): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) clients = self.app.client_manager - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 stack = parsed_args.stack # Run ansible: diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 3a642cf40..04c9c7056 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -246,7 +246,7 @@ def enable_ssh_admin(log, clients, hosts, ssh_user, ssh_key): def config_download(log, clients, stack, templates, - ssh_user, ssh_key, output_dir, verbosity=1): + ssh_user, ssh_key, output_dir, verbosity=0): workflow_client = clients.workflow_engine tripleoclients = clients.tripleoclient