summaryrefslogtreecommitdiffstats
path: root/deployed-server
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-07-18 20:01:06 -0400
committerJames Slagle <jslagle@redhat.com>2017-07-18 20:01:06 -0400
commitd90d57a8c35e066a68a433cac108675dfab1d9e0 (patch)
tree6a02e81c8cc1b420c7b49c22f1e6857fb3a088d1 /deployed-server
parent7e4f7dd2b0324247bba8fd8da5f3becd20e8299f (diff)
Use static environment for deployed-server neutron mappings
We can't include these mappings for the deployed-server neutron ports when using split-stack in the generated environment file because the path to the actual templates directory is not known from with the templates themselves. This patch removes the mappings from the generated environment from the stack output and adds a static environment file with relative paths that will have to be included on the deploy command cli instead. Change-Id: Id4b8c939fa7b26205609819b66e76bf73c9890d0 Closes-Bug: #1705144
Diffstat (limited to 'deployed-server')
-rw-r--r--deployed-server/deployed-server-environment-output.yaml10
1 files changed, 0 insertions, 10 deletions
diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml
index eaf77459..89c3886d 100644
--- a/deployed-server/deployed-server-environment-output.yaml
+++ b/deployed-server/deployed-server-environment-output.yaml
@@ -34,21 +34,11 @@ resources:
fixed_ips:
- ip_address: {get_param: [VipMap, redis]}
- ResourceRegistry:
- type: OS::Heat::Value
- properties:
- type: json
- value:
- OS::TripleO::DeployedServer::ControlPlanePort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
- OS::TripleO::Network::Ports::ControlPlaneVipPort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
-
DeployedServerEnvironment:
type: OS::Heat::Value
properties:
type: json
value:
- resource_registry:
- {get_attr: [ResourceRegistry, value]}
parameter_defaults:
map_merge:
- {get_attr: [DeployedServerPortMapParameter, value]}