From d6fba3f09f8de569b7fcf2bd9519c3112b1cc056 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Wed, 14 Oct 2020 09:48:48 +0530
Subject: [PATCH] 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
---
tripleoclient/constants.py | 2 +-
tripleoclient/v1/overcloud_deploy.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tripleoclient/constants.py b/tripleoclient/constants.py
index abf16c92f..b62711abd 100644
--- a/tripleoclient/constants.py
+++ b/tripleoclient/constants.py
@@ -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/"
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index fa9c70d14..14cc5d4b6 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -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)