Revert "Default to zero verbosity when using Ansible."
This reverts commit 90eee3abc1efca0166b6e5fb05998aa54abcbc05. I'm reverting this because it's a regression. I'm open to not reverting this one if we want to fix it. If the intention is to backport then we should revert this and correct it before backporting. We shouldn't touch the verbosity for anything except ansible items. I'm uncertain if this silenced the heat output for the upgrade tasks but it impacted the deployment output. Change-Id: I1bc27ca55a86d8d51960750d36ba825e5197b75f Closes-Bug: #1863633
This commit is contained in:
parent
dedbf0a3d0
commit
8d2e15164f
@ -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(
|
||||
|
@ -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,
|
||||
@ -979,7 +979,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
|
||||
)
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -165,7 +165,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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user