diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-19 15:05:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-19 15:05:02 +0000 |
| commit | 299c30192535573f7f515a575f13782a1e8fdf82 (patch) | |
| tree | 8bc67106d9f7816a5dfc0d2bbba026b9886dbb62 | |
| parent | 2d1627911760b8aae65adfcbbc995d022879f3f1 (diff) | |
| parent | 5938731160ce4f66fe129e7d15cba652720ec5d2 (diff) | |
Merge "Add a type for the ControlVirtualIP resource"
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 | ||||
| -rw-r--r-- | overcloud.j2.yaml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 77a48658..ebbeef6e 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 39a092b1..80936497 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -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 |