openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use static environment for deployed-server neutron mappings"

This commit is contained in:
Jenkins 2017-07-24 18:14:22 +00:00 committed by Gerrit Code Review
parent a703631f0b d90d57a8c3
commit 6f9f76748c
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployed-server/deployed-server-environment-output.yaml
View File

@ -34,21 +34,11 @@ resources:
fixed_ips: fixed_ips:
- ip_address: {get_param: [VipMap, redis]} - 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: DeployedServerEnvironment:
type: OS::Heat::Value type: OS::Heat::Value
properties: properties:
type: json type: json
value: value:
resource_registry:
{get_attr: [ResourceRegistry, value]}
parameter_defaults: parameter_defaults:
map_merge: map_merge:
- {get_attr: [DeployedServerPortMapParameter, value]} - {get_attr: [DeployedServerPortMapParameter, value]}

4
environments/deployed-server-deployed-neutron-ports.yaml Normal file
View 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