Use default environment with --deployed-server
We still expect users to add -e deployed-server-environment.yaml to the deploy command when using --deployed-server (ex. when using metalsmith for node provisioning). This adds the default env automatically when using --deployed-server with the deploy command. The resource mappings and parameters in it can be overridden by any environment file provided by the user. Change-Id: I849e4077b7fba88651904642fa8c2df08ec8352a
This commit is contained in:
parent
10c2931ea8
commit
d6fba3f09f
|
@ -50,7 +50,7 @@ USER_PARAMETERS = 'user-environments/tripleoclient-parameters.yaml'
|
||||||
# This directory may contain additional environments to use during deploy
|
# This directory may contain additional environments to use during deploy
|
||||||
DEFAULT_ENV_DIRECTORY = os.path.join(os.environ.get('HOME', '~/'),
|
DEFAULT_ENV_DIRECTORY = os.path.join(os.environ.get('HOME', '~/'),
|
||||||
'.tripleo', 'environments')
|
'.tripleo', 'environments')
|
||||||
|
DEPLOYED_SERVER_ENVIRONMENT = 'environments/deployed-server-environment.yaml'
|
||||||
TRIPLEO_PUPPET_MODULES = "/usr/share/openstack-puppet/modules/"
|
TRIPLEO_PUPPET_MODULES = "/usr/share/openstack-puppet/modules/"
|
||||||
PUPPET_MODULES = "/etc/puppet/modules/"
|
PUPPET_MODULES = "/etc/puppet/modules/"
|
||||||
PUPPET_BASE = "/etc/puppet/"
|
PUPPET_BASE = "/etc/puppet/"
|
||||||
|
|
|
@ -492,6 +492,10 @@ class DeployOvercloud(command.Command):
|
||||||
template_utils.deep_update(env, self._create_parameters_env(
|
template_utils.deep_update(env, self._create_parameters_env(
|
||||||
parameters, tht_root, parsed_args.stack))
|
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:
|
if parsed_args.environment_files:
|
||||||
created_env_files.extend(parsed_args.environment_files)
|
created_env_files.extend(parsed_args.environment_files)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue