From aef369e7b4d38e4ca7eb158d2878e84a4b93e603 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. Change-Id: Ic59cc6b2b9b979255c10d71e437afa733517e3e1 Signed-off-by: Luke Short (cherry picked from commit 90eee3abc1efca0166b6e5fb05998aa54abcbc05) --- .../test_overcloud_external_update.py | 4 ++-- .../test_overcloud_external_upgrade.py | 4 ++-- .../test_overcloud_ffwd_upgrade.py | 4 ++-- .../v1/overcloud_update/test_overcloud_update.py | 6 +++--- .../v1/overcloud_upgrade/test_overcloud_upgrade.py | 12 ++++++------ tripleoclient/utils.py | 2 +- tripleoclient/v1/overcloud_deploy.py | 4 ++-- tripleoclient/v1/overcloud_external_update.py | 2 +- tripleoclient/v1/overcloud_external_upgrade.py | 2 +- tripleoclient/v1/overcloud_ffwd_upgrade.py | 2 +- tripleoclient/v1/overcloud_update.py | 2 +- tripleoclient/v1/overcloud_upgrade.py | 2 +- tripleoclient/workflows/deployment.py | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py b/tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py index 5bd730dc0..7856c42d4 100644 --- a/tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py +++ b/tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py @@ -62,7 +62,7 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun): node_user='tripleo-admin', tags='ceph', skip_tags='', - verbosity=1, + verbosity=0, extra_vars={} ) @@ -95,6 +95,6 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars={'key1': 'val1', 'key2': 'val2'} ) diff --git a/tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py b/tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py index abe0d3a4b..6c01a2901 100644 --- a/tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py @@ -62,7 +62,7 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun): node_user='tripleo-admin', tags='ceph', skip_tags='', - verbosity=1, + verbosity=0, extra_vars={} ) @@ -95,6 +95,6 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars={'key1': 'val1', 'key2': 'val2'} ) 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 b4ceab963..3f217da69 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 @@ -171,7 +171,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun): node_user='heat-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -199,7 +199,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun): node_user='my-user', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) diff --git a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py index 5866e90cf..b74471dc0 100644 --- a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py +++ b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py @@ -155,7 +155,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -188,7 +188,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -216,7 +216,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 2c8c78b81..9edd0aae7 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py @@ -195,7 +195,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -230,7 +230,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='validation', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -265,7 +265,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='validation', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -298,7 +298,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -331,7 +331,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='', - verbosity=1, + verbosity=0, extra_vars=None ) @@ -366,7 +366,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun): node_user='tripleo-admin', tags='', skip_tags='pre-upgrade,validation', - verbosity=1, + verbosity=0, extra_vars=None ) diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index 500c784fc..2ca114b58 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -1175,7 +1175,7 @@ def process_multiple_environments(created_env_files, tht_root, def run_update_ansible_action(log, clients, stack, nodes, inventory, playbook, all_playbooks, ssh_user, action=None, tags='', skip_tags='', - verbosity='1', extra_vars=None, + verbosity='0', extra_vars=None, workdir='', priv_key=''): playbooks = [playbook] diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index e97d71b96..46d9c5be1 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -237,7 +237,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, @@ -979,7 +979,7 @@ class DeployOvercloud(command.Command): parsed_args.output_dir, parsed_args.override_ansible_cfg, timeout, - verbosity=self.app_args.verbose_level, + verbosity=(self.app_args.verbose_level - 1), deployment_options=deployment_options, in_flight_validations=parsed_args.inflight) except Exception: diff --git a/tripleoclient/v1/overcloud_external_update.py b/tripleoclient/v1/overcloud_external_update.py index f748bb1fe..99968864c 100644 --- a/tripleoclient/v1/overcloud_external_update.py +++ b/tripleoclient/v1/overcloud_external_update.py @@ -98,7 +98,7 @@ class ExternalUpdateRun(command.Command): self.log.debug("take_action(%s)" % parsed_args) clients = self.app.client_manager orchestration = clients.orchestration - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 stack = parsed_args.stack ansible_dir = None diff --git a/tripleoclient/v1/overcloud_external_upgrade.py b/tripleoclient/v1/overcloud_external_upgrade.py index 49629b41b..b073d8e49 100644 --- a/tripleoclient/v1/overcloud_external_upgrade.py +++ b/tripleoclient/v1/overcloud_external_upgrade.py @@ -98,7 +98,7 @@ class ExternalUpgradeRun(command.Command): self.log.debug("take_action(%s)" % parsed_args) clients = self.app.client_manager orchestration = clients.orchestration - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 stack = parsed_args.stack ansible_dir = None diff --git a/tripleoclient/v1/overcloud_ffwd_upgrade.py b/tripleoclient/v1/overcloud_ffwd_upgrade.py index 78a250155..fd0e3c126 100644 --- a/tripleoclient/v1/overcloud_ffwd_upgrade.py +++ b/tripleoclient/v1/overcloud_ffwd_upgrade.py @@ -153,7 +153,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 orchestration = clients.orchestration stack = parsed_args.stack diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py index 8fb1ddc1f..3c26128ca 100644 --- a/tripleoclient/v1/overcloud_update.py +++ b/tripleoclient/v1/overcloud_update.py @@ -143,7 +143,7 @@ class UpdateRun(command.Command): self.log.debug("take_action(%s)" % parsed_args) clients = self.app.client_manager orchestration = clients.orchestration - verbosity = self.app_args.verbose_level + verbosity = self.app_args.verbose_level - 1 stack = parsed_args.stack ansible_dir = None diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py index 8b2637cc2..ff66ef765 100644 --- a/tripleoclient/v1/overcloud_upgrade.py +++ b/tripleoclient/v1/overcloud_upgrade.py @@ -198,7 +198,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 orchestration = clients.orchestration stack = parsed_args.stack diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 826831ce2..737b730a3 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -342,7 +342,7 @@ def enable_ssh_admin(log, clients, plan_name, hosts, ssh_user, ssh_key, def config_download(log, clients, stack, templates, ssh_user, ssh_key, ssh_network, - output_dir, override_ansible_cfg, timeout, verbosity=1, + output_dir, override_ansible_cfg, timeout, verbosity=0, deployment_options={}, in_flight_validations=False): workflow_client = clients.workflow_engine