openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Revert "Default to zero verbosity when using Ansible.""

This commit is contained in:
Zuul 2020-02-26 02:45:00 +00:00 committed by Gerrit Code Review
parent 58c0c2fb76 8d2e15164f
commit fbfd70c7e4
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
View File

@ -148,7 +148,7 @@ class TestOvercloudUpdateConverge(fakes.TestOvercloudUpdateConverge):
# Get the command object to test
app_args = mock.Mock()
app_args.verbose_level = 0
app_args.verbose_level = 1
self.cmd = overcloud_update.UpdateConverge(self.app, app_args)
@mock.patch(

4
tripleoclient/v1/overcloud_deploy.py
View File

@ -228,7 +228,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 - 1,
stack_name, self.app_args.verbose_level,
timeout=timeout,
run_validations=run_validations,
skip_deploy_identifier=skip_deploy_identifier,
@ -982,7 +982,7 @@ class DeployOvercloud(command.Command):
parsed_args.output_dir,
parsed_args.override_ansible_cfg,
timeout,
verbosity=(self.app_args.verbose_level - 1),
verbosity=self.app_args.verbose_level,
deployment_options=deployment_options,
in_flight_validations=parsed_args.inflight
)

2
tripleoclient/v1/overcloud_external_update.py
View File

@ -109,7 +109,7 @@ class ExternalUpdateRun(command.Command):
parsed_args.stack
),
output_dir=ansible_dir,
verbosity=self.app_args.verbose_level - 1,
verbosity=self.app_args.verbose_level,
ansible_playbook_name=constants.EXTERNAL_UPDATE_PLAYBOOKS,
extra_vars=oooutils.parse_extra_vars(
extra_var_strings=parsed_args.extra_vars

2
tripleoclient/v1/overcloud_external_upgrade.py
View File

@ -108,7 +108,7 @@ class ExternalUpgradeRun(command.Command):
parsed_args.stack
),
output_dir=ansible_dir,
verbosity=self.app_args.verbose_level - 1,
verbosity=self.app_args.verbose_level,
ansible_playbook_name=constants.EXTERNAL_UPGRADE_PLAYBOOKS,
inventory_path=oooutils.get_tripleo_ansible_inventory(
parsed_args.static_inventory,

2
tripleoclient/v1/overcloud_ffwd_upgrade.py
View File

@ -181,7 +181,7 @@ class FFWDUpgradeRun(command.Command):
parsed_args.stack
),
output_dir=ansible_dir,
verbosity=self.app_args.verbose_level - 1,
verbosity=self.app_args.verbose_level,
ansible_playbook_name=constants.FFWD_UPGRADE_PLAYBOOK,
inventory_path=oooutils.get_tripleo_ansible_inventory(
parsed_args.static_inventory,

2
tripleoclient/v1/overcloud_update.py
View File

@ -158,7 +158,7 @@ class UpdateRun(command.Command):
parsed_args.stack
),
output_dir=ansible_dir,
verbosity=self.app_args.verbose_level - 1,
verbosity=self.app_args.verbose_level,
ansible_playbook_name=playbook,
inventory_path=oooutils.get_tripleo_ansible_inventory(
parsed_args.static_inventory,

2
tripleoclient/v1/overcloud_upgrade.py
View File

@ -212,7 +212,7 @@ class UpgradeRun(command.Command):
parsed_args.stack
),
output_dir=ansible_dir,
verbosity=self.app_args.verbose_level - 1,
verbosity=self.app_args.verbose_level,
ansible_playbook_name=playbook,
inventory_path=oooutils.get_tripleo_ansible_inventory(
parsed_args.static_inventory,

2
tripleoclient/workflows/deployment.py
View File

@ -257,7 +257,7 @@ def enable_ssh_admin(stack, hosts, ssh_user, ssh_key, timeout):
def config_download(log, clients, stack, ssh_network=None,
output_dir=None, override_ansible_cfg=None,
timeout=None, verbosity=0, deployment_options=None,
timeout=None, verbosity=1, deployment_options=None,
in_flight_validations=False,
ansible_playbook_name='deploy_steps_playbook.yaml',
limit_list=None, extra_vars=None, inventory_path=None,