X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fexternal-loadbalancer-vip-v6.yaml;h=fbd1fb98ae690c671b3854e40c24572ec160f856;hb=957fbb1e15a4e975c9cc4bdaa1acf26bfe8631fe;hp=5a2ef505a59dbe8070ec6f7f521024c4feafdecf;hpb=749d24ec9d6d6c3d0198a287bd7adebca263d7b3;p=apex-tripleo-heat-templates.git

diff --git a/environments/external-loadbalancer-vip-v6.yaml b/environments/external-loadbalancer-vip-v6.yaml
index 5a2ef505..fbd1fb98 100644
--- a/environments/external-loadbalancer-vip-v6.yaml
+++ b/environments/external-loadbalancer-vip-v6.yaml
@@ -1,29 +1,24 @@
 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::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::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool_v6.yaml
   # 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
+  # Management network is optional and disabled by default
+  #OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.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: 2001:db8:fd00:1000:0000:0000:0000:0005
-  InternalApiNetworkVip: fd00:fd00:fd00:2000:0000:0000:0000:0005
-  StorageNetworkVip: fd00:fd00:fd00:3000:0000:0000:0000:0005
-  StorageMgmtNetworkVip: fd00:fd00:fd00:4000:0000:0000:0000:0005
-  ServiceVips:
-    redis: fd00:fd00:fd00:2000:0000:0000:0000:0006
+  ControlFixedIPs: [{'ip_address':'192.0.2.251'}]
+  PublicVirtualFixedIPs: [{'ip_address':'2001:db8:fd00:1000:0000:0000:0000:0005'}]
+  InternalApiVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:2000:0000:0000:0000:0005'}]
+  StorageVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:3000:0000:0000:0000:0005'}]
+  StorageMgmtVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:4000:0000:0000:0000:0005'}]
+  RedisVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:2000:0000:0000:0000:0006'}]
   ControllerIPs:
     external:
       - 2001:db8:fd00:1000:0000:0000:0000:0007