Enables trunk ports in bgpvpn scenario

[apex-tripleo-heat-templates.git] / environments / external-loadbalancer-vip.yaml

diff --git a/environments/external-loadbalancer-vip.yaml b/environments/external-loadbalancer-vip.yaml
index 198892c..33f145d 100644 (file)
--- a/environments/external-loadbalancer-vip.yaml
+++ b/environments/external-loadbalancer-vip.yaml
@@ -1,29 +1,28 @@
 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::Network::Ports::ExternalVipPort: ../network/ports/external.yaml
+  OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api.yaml
+  OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage.yaml
+  OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt.yaml
+  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.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
   OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
   OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
-  OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
+  # Management network is optional and disabled by default
+  #OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
 
 parameter_defaults:
   # When using an external loadbalancer set the following in 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.168.24.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
@@ -35,6 +34,6 @@ parameter_defaults:
     - 172.16.3.253
     tenant:
     - 172.16.0.253
-    management:
-    - 172.16.4.253
+    #management:
+    #- 172.16.4.253
   EnableLoadBalancer: false