From e36e9562e3e03e078efd545ae55af175ec978cab Mon Sep 17 00:00:00 2001 From: ramishra Date: Mon, 3 May 2021 11:12:55 +0530 Subject: [PATCH] Use environment files when building image params Also moves deployed-server-environment.yaml before the user environments as it resets OS::TripleO::DeployedServer::ControlPlanePort. Regression from I8fb6ca088b1052488ff4f9ada4d3ab29c0be4735 Closes-Bug: #1926758 Change-Id: I1a6da2e92cc994240f53e8d702f61d941b6a37f7 --- tripleoclient/v1/overcloud_deploy.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 4618388a7..98ec2b641 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -253,9 +253,20 @@ class DeployOvercloud(command.Command): created_env_files = [] created_env_files.append( os.path.join(new_tht_root, constants.DEFAULT_RESOURCE_REGISTRY)) + if parsed_args.environment_directories: created_env_files.extend(utils.load_environment_directories( parsed_args.environment_directories)) + + if parsed_args.deployed_server: + created_env_files.append( + os.path.join( + new_tht_root, + constants.DEPLOYED_SERVER_ENVIRONMENT)) + + if parsed_args.environment_files: + created_env_files.extend(parsed_args.environment_files) + created_env_files.extend( self._provision_baremetal(parsed_args, new_tht_root)) @@ -269,7 +280,6 @@ class DeployOvercloud(command.Command): image_params = kolla_builder.container_images_prepare_multi( env, roles.get_roles_data(parsed_args.roles_file, new_tht_root), dry_run=True) - parameters = {} if image_params: default_image_params.update(image_params) @@ -295,15 +305,6 @@ class DeployOvercloud(command.Command): parameters, new_tht_root, parsed_args.stack) created_env_files.extend(param_env) - if parsed_args.deployed_server: - created_env_files.append( - os.path.join( - new_tht_root, - constants.DEPLOYED_SERVER_ENVIRONMENT)) - - if parsed_args.environment_files: - created_env_files.extend(parsed_args.environment_files) - deployment_options = {} if parsed_args.deployment_python_interpreter: deployment_options['ansible_python_interpreter'] = \