openstack/tripleo-heat-templates
Code Issues Proposed changes

Modify external loadbalancer environments to use new FixedIPs

Browse Source 
This change modifes the environment files
external_loadbalancer_vip.yaml and external_loadbalancer_vip_v6.yaml
to take advantage of the new mechanism for setting FixedIPs for each
VIP. The previous mechanism was used to set the VIP addresses
directly, but each VIP now contains a FixedIPs parameter which sets
the IP for the VIP when it is created. The advantage of the new
mechanism is that we no longer have to set each VIP to noop.yaml in
the resource registry, since vip.yaml can now handle both automatic
and fixed IP selection.

Change-Id: I6e66ea6041fe7357c01b8f79f04e2533579206dc
This commit is contained in:
Dan Sneddon 2016-09-28 12:53:53 -07:00
parent 8b38376787
commit a3f03eb307
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
environments/external-loadbalancer-vip-v6.yaml
View File

@ -1,29 +1,24 @@
resource_registry: resource_registry:
OS::TripleO::Network::Ports::NetVipMap: ../network/ports/net_vip_map_external_v6.yaml
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/noop.yaml
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/from_service_v6.yaml
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool_v6.yaml OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool_v6.yaml
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool_v6.yaml OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool_v6.yaml
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool_v6.yaml OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool_v6.yaml
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool_v6.yaml OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool_v6.yaml
# OVS doesn't support IPv6 endpoints for tunneling yet, so this remains IPv4 for now. # OVS doesn't support IPv6 endpoints for tunneling yet, so this remains IPv4 for now.
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
# Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.yaml
parameter_defaults: parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults # When using an external loadbalancer set the following in parameter_defaults
# to control your VIPs (currently one per network) # to control your VIPs (currently one per network)
# NOTE: we will eventually move to one VIP per service # NOTE: we will eventually move to one VIP per service
# #
ControlPlaneIP: 192.0.2.251 ControlFixedIPs: [{'ip_address':'192.0.2.251'}]
ExternalNetworkVip: 2001:db8:fd00:1000:0000:0000:0000:0005 PublicVirtualFixedIPs: [{'ip_address':'2001:db8:fd00:1000:0000:0000:0000:0005'}]
InternalApiNetworkVip: fd00:fd00:fd00:2000:0000:0000:0000:0005 InternalApiVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:2000:0000:0000:0000:0005'}]
StorageNetworkVip: fd00:fd00:fd00:3000:0000:0000:0000:0005 StorageVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:3000:0000:0000:0000:0005'}]
StorageMgmtNetworkVip: fd00:fd00:fd00:4000:0000:0000:0000:0005 StorageMgmtVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:4000:0000:0000:0000:0005'}]
ServiceVips: RedisVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:2000:0000:0000:0000:0006'}]
redis: fd00:fd00:fd00:2000:0000:0000:0000:0006
ControllerIPs: ControllerIPs:
external: external:
- 2001:db8:fd00:1000:0000:0000:0000:0007 - 2001:db8:fd00:1000:0000:0000:0000:0007

19
environments/external-loadbalancer-vip.yaml
View File

@ -1,10 +1,4 @@
resource_registry: resource_registry:
OS::TripleO::Network::Ports::NetVipMap: ../network/ports/net_vip_map_external.yaml
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/noop.yaml
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/from_service.yaml
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool.yaml OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool.yaml
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool.yaml OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
@ -18,13 +12,12 @@ parameter_defaults:
# to control your VIPs (currently one per network) # to control your VIPs (currently one per network)
# NOTE: we will eventually move to one VIP per service # NOTE: we will eventually move to one VIP per service
# #
ControlPlaneIP: 192.0.2.251 ControlFixedIPs: [{'ip_address':'192.0.2.251'}]
ExternalNetworkVip: 10.0.0.251 PublicVirtualFixedIPs: [{'ip_address':'10.0.0.251'}]
InternalApiNetworkVip: 172.16.2.251 InternalApiVirtualFixedIPs: [{'ip_address':'172.16.2.251'}]
StorageNetworkVip: 172.16.1.251 StorageVirtualFixedIPs: [{'ip_address':'172.16.1.251'}]
StorageMgmtNetworkVip: 172.16.3.251 StorageMgmtVirtualFixedIPs: [{'ip_address':'172.16.3.251'}]
ServiceVips: RedisVirtualFixedIPs: [{'ip_address':'172.16.2.252'}]
redis: 172.16.2.252
ControllerIPs: ControllerIPs:
external: external:
- 10.0.0.253 - 10.0.0.253