Browse Source

Merge "Default to zero verbosity when using Ansible." into stable/train

changes/33/705033/1
Zuul Gerrit Code Review 3 weeks ago
parent
commit
30a2190802
13 changed files with 24 additions and 24 deletions
  1. +2
    -2
      tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py
  2. +2
    -2
      tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py
  3. +2
    -2
      tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py
  4. +3
    -3
      tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
  5. +6
    -6
      tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
  6. +1
    -1
      tripleoclient/utils.py
  7. +2
    -2
      tripleoclient/v1/overcloud_deploy.py
  8. +1
    -1
      tripleoclient/v1/overcloud_external_update.py
  9. +1
    -1
      tripleoclient/v1/overcloud_external_upgrade.py
  10. +1
    -1
      tripleoclient/v1/overcloud_ffwd_upgrade.py
  11. +1
    -1
      tripleoclient/v1/overcloud_update.py
  12. +1
    -1
      tripleoclient/v1/overcloud_upgrade.py
  13. +1
    -1
      tripleoclient/workflows/deployment.py

+ 2
- 2
tripleoclient/tests/v1/overcloud_external_update/test_overcloud_external_update.py View File

@@ -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'}
)

+ 2
- 2
tripleoclient/tests/v1/overcloud_external_upgrade/test_overcloud_external_upgrade.py View File

@@ -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'}
)

+ 2
- 2
tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py View File

@@ -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
)



+ 3
- 3
tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py View File

@@ -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(


+ 6
- 6
tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py View File

@@ -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
)



+ 1
- 1
tripleoclient/utils.py View File

@@ -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]


+ 2
- 2
tripleoclient/v1/overcloud_deploy.py View File

@@ -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,
@@ -996,7 +996,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:


+ 1
- 1
tripleoclient/v1/overcloud_external_update.py View File

@@ -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


+ 1
- 1
tripleoclient/v1/overcloud_external_upgrade.py View File

@@ -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


+ 1
- 1
tripleoclient/v1/overcloud_ffwd_upgrade.py View File

@@ -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


+ 1
- 1
tripleoclient/v1/overcloud_update.py View File

@@ -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


+ 1
- 1
tripleoclient/v1/overcloud_upgrade.py View File

@@ -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



+ 1
- 1
tripleoclient/workflows/deployment.py View File

@@ -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


Loading…
Cancel
Save