diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-18 10:22:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-18 10:22:39 +0000 |
| commit | 8e1fd53efb481a4073dc707601dd3ed9463a1854 (patch) | |
| tree | 51955b289ddaed05aa25f572d460b0aa02f206fc /overcloud.yaml | |
| parent | 0284f863a95d4cd27b19de048141cd7ec07c161b (diff) | |
| parent | 22b4acf454d74302f1cca03f7fe22f63619b1f70 (diff) | |
Merge "Allow for usage of pre-allocated IPs for the controller nodes"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 1a571120..cc6f4174 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -1201,17 +1201,18 @@ resources: RedisVirtualIP: depends_on: Networks - type: OS::TripleO::Controller::Ports::RedisVipPort + type: OS::TripleO::Network::Ports::RedisVipPort properties: ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} ControlPlaneNetwork: {get_param: NeutronControlPlaneID} PortName: redis_virtual_ip NetworkName: {get_param: [ServiceNetMap, RedisNetwork]} + ServiceName: redis # The public VIP is on the External net, falls back to ctlplane PublicVirtualIP: depends_on: Networks - type: OS::TripleO::Controller::Ports::ExternalPort + type: OS::TripleO::Network::Ports::ExternalVipPort properties: ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} ControlPlaneNetwork: {get_param: NeutronControlPlaneID} @@ -1220,21 +1221,21 @@ resources: InternalApiVirtualIP: depends_on: Networks - type: OS::TripleO::Controller::Ports::InternalApiPort + type: OS::TripleO::Network::Ports::InternalApiVipPort properties: ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} PortName: internal_api_virtual_ip StorageVirtualIP: depends_on: Networks - type: OS::TripleO::Controller::Ports::StoragePort + type: OS::TripleO::Network::Ports::StorageVipPort properties: ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} PortName: storage_virtual_ip StorageMgmtVirtualIP: depends_on: Networks - type: OS::TripleO::Controller::Ports::StorageMgmtPort + type: OS::TripleO::Network::Ports::StorageMgmtVipPort properties: ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} PortName: storage_management_virtual_ip |