diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 18:14:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 18:14:22 +0000 |
| commit | 6f9f76748c93d88b0f72488a4b841401df3f54b7 (patch) | |
| tree | 3bfcaf52e43aa9d3d4ff6826e01abf9868568c39 | |
| parent | a703631f0baedbbe03185c90947284b4f825b326 (diff) | |
| parent | d90d57a8c35e066a68a433cac108675dfab1d9e0 (diff) | |
Merge "Use static environment for deployed-server neutron mappings"
| -rw-r--r-- | deployed-server/deployed-server-environment-output.yaml | 10 | ||||
| -rw-r--r-- | environments/deployed-server-deployed-neutron-ports.yaml | 4 |
2 files changed, 4 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]} diff --git a/environments/deployed-server-deployed-neutron-ports.yaml b/environments/deployed-server-deployed-neutron-ports.yaml new file mode 100644 index 00000000..1464f4be --- /dev/null +++ b/environments/deployed-server-deployed-neutron-ports.yaml @@ -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 + |