Revert "Default to zero verbosity when using Ansible."
This reverts commit aef369e7b4
.
Change-Id: I57aaf15d502ad5aae8ae5d368ed384225fc1a9f3
Closes-Bug: #1863633
This commit is contained in:
parent
aef369e7b4
commit
358465d2d7
|
@ -62,7 +62,7 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='ceph',
|
tags='ceph',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars={}
|
extra_vars={}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -95,6 +95,6 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars={'key1': 'val1', 'key2': 'val2'}
|
extra_vars={'key1': 'val1', 'key2': 'val2'}
|
||||||
)
|
)
|
||||||
|
|
|
@ -62,7 +62,7 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='ceph',
|
tags='ceph',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars={}
|
extra_vars={}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -95,6 +95,6 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars={'key1': 'val1', 'key2': 'val2'}
|
extra_vars={'key1': 'val1', 'key2': 'val2'}
|
||||||
)
|
)
|
||||||
|
|
|
@ -171,7 +171,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun):
|
||||||
node_user='heat-admin',
|
node_user='heat-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -199,7 +199,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun):
|
||||||
node_user='my-user',
|
node_user='my-user',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -188,7 +188,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ class TestOvercloudUpdateConverge(fakes.TestOvercloudUpdateConverge):
|
||||||
|
|
||||||
# Get the command object to test
|
# Get the command object to test
|
||||||
app_args = mock.Mock()
|
app_args = mock.Mock()
|
||||||
app_args.verbose_level = 0
|
app_args.verbose_level = 1
|
||||||
self.cmd = overcloud_update.UpdateConverge(self.app, app_args)
|
self.cmd = overcloud_update.UpdateConverge(self.app, app_args)
|
||||||
|
|
||||||
@mock.patch(
|
@mock.patch(
|
||||||
|
|
|
@ -195,7 +195,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -230,7 +230,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='validation',
|
skip_tags='validation',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='validation',
|
tags='validation',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -298,7 +298,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -331,7 +331,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='',
|
skip_tags='',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -366,7 +366,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
||||||
node_user='tripleo-admin',
|
node_user='tripleo-admin',
|
||||||
tags='',
|
tags='',
|
||||||
skip_tags='pre-upgrade,validation',
|
skip_tags='pre-upgrade,validation',
|
||||||
verbosity=0,
|
verbosity=1,
|
||||||
extra_vars=None
|
extra_vars=None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1175,7 +1175,7 @@ def process_multiple_environments(created_env_files, tht_root,
|
||||||
def run_update_ansible_action(log, clients, stack, nodes, inventory,
|
def run_update_ansible_action(log, clients, stack, nodes, inventory,
|
||||||
playbook, all_playbooks, ssh_user,
|
playbook, all_playbooks, ssh_user,
|
||||||
action=None, tags='', skip_tags='',
|
action=None, tags='', skip_tags='',
|
||||||
verbosity='0', extra_vars=None,
|
verbosity='1', extra_vars=None,
|
||||||
workdir='', priv_key=''):
|
workdir='', priv_key=''):
|
||||||
|
|
||||||
playbooks = [playbook]
|
playbooks = [playbook]
|
||||||
|
|
|
@ -237,7 +237,7 @@ class DeployOvercloud(command.Command):
|
||||||
os.path.abspath(tht_root)))
|
os.path.abspath(tht_root)))
|
||||||
deployment.deploy_and_wait(
|
deployment.deploy_and_wait(
|
||||||
self.log, self.clients, stack,
|
self.log, self.clients, stack,
|
||||||
stack_name, self.app_args.verbose_level - 1,
|
stack_name, self.app_args.verbose_level,
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
run_validations=run_validations,
|
run_validations=run_validations,
|
||||||
skip_deploy_identifier=skip_deploy_identifier,
|
skip_deploy_identifier=skip_deploy_identifier,
|
||||||
|
@ -979,7 +979,7 @@ class DeployOvercloud(command.Command):
|
||||||
parsed_args.output_dir,
|
parsed_args.output_dir,
|
||||||
parsed_args.override_ansible_cfg,
|
parsed_args.override_ansible_cfg,
|
||||||
timeout,
|
timeout,
|
||||||
verbosity=(self.app_args.verbose_level - 1),
|
verbosity=self.app_args.verbose_level,
|
||||||
deployment_options=deployment_options,
|
deployment_options=deployment_options,
|
||||||
in_flight_validations=parsed_args.inflight)
|
in_flight_validations=parsed_args.inflight)
|
||||||
except Exception:
|
except Exception:
|
||||||
|
|
|
@ -98,7 +98,7 @@ class ExternalUpdateRun(command.Command):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
clients = self.app.client_manager
|
clients = self.app.client_manager
|
||||||
orchestration = clients.orchestration
|
orchestration = clients.orchestration
|
||||||
verbosity = self.app_args.verbose_level - 1
|
verbosity = self.app_args.verbose_level
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
|
|
||||||
ansible_dir = None
|
ansible_dir = None
|
||||||
|
|
|
@ -98,7 +98,7 @@ class ExternalUpgradeRun(command.Command):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
clients = self.app.client_manager
|
clients = self.app.client_manager
|
||||||
orchestration = clients.orchestration
|
orchestration = clients.orchestration
|
||||||
verbosity = self.app_args.verbose_level - 1
|
verbosity = self.app_args.verbose_level
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
|
|
||||||
ansible_dir = None
|
ansible_dir = None
|
||||||
|
|
|
@ -153,7 +153,7 @@ class FFWDUpgradeRun(command.Command):
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
oooutils.ffwd_upgrade_operator_confirm(parsed_args.yes, self.log)
|
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
|
clients = self.app.client_manager
|
||||||
orchestration = clients.orchestration
|
orchestration = clients.orchestration
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
|
|
|
@ -143,7 +143,7 @@ class UpdateRun(command.Command):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
clients = self.app.client_manager
|
clients = self.app.client_manager
|
||||||
orchestration = clients.orchestration
|
orchestration = clients.orchestration
|
||||||
verbosity = self.app_args.verbose_level - 1
|
verbosity = self.app_args.verbose_level
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
|
|
||||||
ansible_dir = None
|
ansible_dir = None
|
||||||
|
|
|
@ -198,7 +198,7 @@ class UpgradeRun(command.Command):
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
clients = self.app.client_manager
|
clients = self.app.client_manager
|
||||||
verbosity = self.app_args.verbose_level - 1
|
verbosity = self.app_args.verbose_level
|
||||||
orchestration = clients.orchestration
|
orchestration = clients.orchestration
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
|
|
||||||
|
|
|
@ -342,7 +342,7 @@ def enable_ssh_admin(log, clients, plan_name, hosts, ssh_user, ssh_key,
|
||||||
|
|
||||||
def config_download(log, clients, stack, templates,
|
def config_download(log, clients, stack, templates,
|
||||||
ssh_user, ssh_key, ssh_network,
|
ssh_user, ssh_key, ssh_network,
|
||||||
output_dir, override_ansible_cfg, timeout, verbosity=0,
|
output_dir, override_ansible_cfg, timeout, verbosity=1,
|
||||||
deployment_options={},
|
deployment_options={},
|
||||||
in_flight_validations=False):
|
in_flight_validations=False):
|
||||||
workflow_client = clients.workflow_engine
|
workflow_client = clients.workflow_engine
|
||||||
|
|
Loading…
Reference in New Issue