diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index c067df69d..5ab7c02a1 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -915,6 +915,9 @@ class DeployOvercloud(command.Command): deployment_options['ansible_python_interpreter'] = \ parsed_args.deployment_python_interpreter + disabled_val = parsed_args.disable_validations + enable_val = parsed_args.run_validations + deployment.config_download( self.log, self.clients, stack, parsed_args.templates, parsed_args.overcloud_ssh_user, @@ -924,7 +927,8 @@ class DeployOvercloud(command.Command): parsed_args.override_ansible_cfg, timeout, verbosity=self.app_args.verbose_level, - deployment_options=deployment_options) + deployment_options=deployment_options, + in_flight_validations=(enable_val or not disabled_val)) except Exception: deployment.set_deployment_status( self.clients, 'failed', diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index f3f1745e6..ea33038a3 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -317,16 +317,23 @@ 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, - deployment_options={}): + deployment_options={}, + in_flight_validations=True): workflow_client = clients.workflow_engine tripleoclients = clients.tripleoclient + if in_flight_validations: + skip_tags = '' + else: + skip_tags = 'opendev-validation' + workflow_input = { 'verbosity': verbosity, 'plan_name': stack.stack_name, 'ssh_network': ssh_network, 'config_download_timeout': timeout, 'deployment_options': deployment_options, + 'skip_tags': skip_tags } if output_dir: workflow_input.update(dict(work_dir=output_dir))