openstack
/
python-tripleoclient
Code Issues Proposed changes

Revert "Default to zero verbosity when using Ansible." 

This reverts commit b3ba675b9a.

Change-Id: I15af129a0e54e88f8d90d4f617fb4cb55c644807
Closes-Bug: #1863633
This commit is contained in:
Alex Schultz 2020-02-17 16:09:50 +00:00
parent b3ba675b9a
commit 84c7226b27
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py
View File

@ -160,7 +160,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun):
playbook=constants.FFWD_UPGRADE_PLAYBOOK,
node_user='heat-admin',
skip_tags='',
verbosity=0
verbosity=1
)
@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=0
verbosity=1
)
@mock.patch('tripleoclient.workflows.package_update.update_ansible',

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

@ -151,7 +151,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun):
playbook='fake-playbook.yaml',
node_user='tripleo-admin',
skip_tags='',
verbosity=0
verbosity=1
)
@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=0
verbosity=1
)
@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=0
verbosity=1
)
@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 = 0
app_args.verbose_level = 1
self.cmd = overcloud_update.UpdateConverge(self.app, app_args)
@mock.patch(

10
tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
View File

@ -165,7 +165,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
playbook='fake-playbook.yaml',
node_user='tripleo-admin',
skip_tags='',
verbosity=0
verbosity=1
)
@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=0
verbosity=1
)
@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=0
verbosity=1
)
@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=0
verbosity=1
)
@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=0
verbosity=1
)
@mock.patch('tripleoclient.workflows.package_update.update_ansible',

2
tripleoclient/utils.py
View File

@ -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='0', workdir='', priv_key=''):
verbosity='1', workdir='', priv_key=''):
playbooks = [playbook]
if playbook == "all":

5
tripleoclient/v1/overcloud_deploy.py
View File

@ -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 - 1,
stack_name, self.app_args.verbose_level,
timeout=timeout,
run_validations=run_validations,
skip_deploy_identifier=skip_deploy_identifier)
@ -1028,8 +1028,7 @@ class DeployOvercloud(command.Command):
parsed_args.overcloud_ssh_user,
parsed_args.overcloud_ssh_key,
parsed_args.output_dir,
verbosity=(
self.app_args.verbose_level - 1))
verbosity=self.app_args.verbose_level)
# Force fetching of attributes
stack.get()

2
tripleoclient/v1/overcloud_ffwd_upgrade.py
View File

@ -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 - 1
verbosity = self.app_args.verbose_level
clients = self.app.client_manager
# Run ansible:

2
tripleoclient/v1/overcloud_update.py
View File

@ -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 - 1
verbosity = self.app_args.verbose_level
stack = parsed_args.stack
# Run ansible:

2
tripleoclient/v1/overcloud_upgrade.py
View File

@ -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 - 1
verbosity = self.app_args.verbose_level
stack = parsed_args.stack
# Run ansible:

2
tripleoclient/workflows/deployment.py
View File

@ -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=0):
ssh_user, ssh_key, output_dir, verbosity=1):
workflow_client = clients.workflow_engine
tripleoclients = clients.tripleoclient