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
This commit is contained in:
parent
7e4f7dd2b0
commit
d90d57a8c3
@ -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]}
|
||||
|
4
environments/deployed-server-deployed-neutron-ports.yaml
Normal file
4
environments/deployed-server-deployed-neutron-ports.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
resource_registry:
|
||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
|
||||
|
Loading…
Reference in New Issue
Block a user