diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2016-09-28 12:53:53 -0700 |
|---|---|---|
| committer | Dan Sneddon <dsneddon@redhat.com> | 2016-11-21 17:29:38 +0000 |
| commit | a3f03eb307797ac5eef1251b9252e642db326e07 (patch) | |
| tree | 10b8685c257059086e2b02677f05d013b1b54b48 /environments/external-loadbalancer-vip.yaml | |
| parent | 8b38376787cad1dfb6a6142b581ca4229827ae71 (diff) | |
Modify external loadbalancer environments to use new FixedIPs
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
Diffstat (limited to 'environments/external-loadbalancer-vip.yaml')
| -rw-r--r-- | environments/external-loadbalancer-vip.yaml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/environments/external-loadbalancer-vip.yaml b/environments/external-loadbalancer-vip.yaml index 8656ba1a..1759c04c 100644 --- a/environments/external-loadbalancer-vip.yaml +++ b/environments/external-loadbalancer-vip.yaml @@ -1,10 +1,4 @@ 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::InternalApiPort: ../network/ports/internal_api_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) # NOTE: we will eventually move to one VIP per service # - ControlPlaneIP: 192.0.2.251 - ExternalNetworkVip: 10.0.0.251 - InternalApiNetworkVip: 172.16.2.251 - StorageNetworkVip: 172.16.1.251 - StorageMgmtNetworkVip: 172.16.3.251 - ServiceVips: - redis: 172.16.2.252 + ControlFixedIPs: [{'ip_address':'192.0.2.251'}] + PublicVirtualFixedIPs: [{'ip_address':'10.0.0.251'}] + InternalApiVirtualFixedIPs: [{'ip_address':'172.16.2.251'}] + StorageVirtualFixedIPs: [{'ip_address':'172.16.1.251'}] + StorageMgmtVirtualFixedIPs: [{'ip_address':'172.16.3.251'}] + RedisVirtualFixedIPs: [{'ip_address':'172.16.2.252'}] ControllerIPs: external: - 10.0.0.253 |