openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Use default environment with --deployed-server"

This commit is contained in:
Zuul 2020-10-16 03:53:54 +00:00 committed by Gerrit Code Review
parent 3f4aacdca2 d6fba3f09f
commit d2f665ef6c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/constants.py
View File

@ -50,7 +50,7 @@ USER_PARAMETERS = 'user-environments/tripleoclient-parameters.yaml'
# This directory may contain additional environments to use during deploy
DEFAULT_ENV_DIRECTORY = os.path.join(os.environ.get('HOME', '~/'),
'.tripleo', 'environments')
DEPLOYED_SERVER_ENVIRONMENT = 'environments/deployed-server-environment.yaml'
TRIPLEO_PUPPET_MODULES = "/usr/share/openstack-puppet/modules/"
PUPPET_MODULES = "/etc/puppet/modules/"
PUPPET_BASE = "/etc/puppet/"

4
tripleoclient/v1/overcloud_deploy.py
View File

@ -492,6 +492,10 @@ class DeployOvercloud(command.Command):
template_utils.deep_update(env, self._create_parameters_env(
parameters, tht_root, parsed_args.stack))
if parsed_args.deployed_server:
created_env_files.append(
os.path.join(tht_root, constants.DEPLOYED_SERVER_ENVIRONMENT))
if parsed_args.environment_files:
created_env_files.extend(parsed_args.environment_files)