openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add a type for the ControlVirtualIP resource"

Browse Source
This commit is contained in:
Jenkins 2016-12-19 15:05:02 +00:00 committed by Gerrit Code Review
commit 299c301925
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -90,6 +90,7 @@ resource_registry:
OS::TripleO::Network::Ports::StorageVipPort: network/ports/noop.yaml
OS::TripleO::Network::Ports::StorageMgmtVipPort: network/ports/noop.yaml
OS::TripleO::Network::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Neutron::Port
# Service to network Mappings
OS::TripleO::ServiceNetMap: network/service_net_map.yaml

2
overcloud.j2.yaml
View File

@ -477,7 +477,7 @@ resources:
type: OS::TripleO::Network
ControlVirtualIP:
type: OS::Neutron::Port
type: OS::TripleO::Network::Ports::ControlPlaneVipPort
depends_on: Networks
properties:
name: control_virtual_ip