From bf17d081b87592eef775b183827a5d3b5380611c Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Thu, 5 Mar 2020 12:32:03 +0530 Subject: [PATCH] Skip network check with stack env when validations disabled Allow for bypassing check_stack_network_matches_env_files() when --disable-validations is provided. Change-Id: Ie24163a39a68ec73ae8ea5ad1011eb3789961077 Closes-Bug: #1866155 (cherry picked from commit d8a7eaf88c22af6e31d27df9e5ef83a83a8f17b7) --- tripleoclient/v1/overcloud_deploy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 5e324b190..fe64329f6 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -442,8 +442,9 @@ class DeployOvercloud(command.Command): template_utils.deep_update(env, localenv) if stack: - # note(aschultz): network validation goes here before we deploy - utils.check_stack_network_matches_env_files(stack, env) + if not parsed_args.disable_validations: + # note(aschultz): network validation goes here before we deploy + utils.check_stack_network_matches_env_files(stack, env) bp_cleanup = self._create_breakpoint_cleanup_env( tht_root, parsed_args.stack) template_utils.deep_update(env, bp_cleanup)