X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fnetwork-environment.yaml;h=8b5b070c1ae8ee4aafdfe05893681555c35616bb;hb=75a4194157aa05581812568c1b5412250110618c;hp=874e0112803f0793e480e6c495d4a28ec7a05de3;hpb=7726620121424d8f0959587d0a1baf1768e57c63;p=apex.git

diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index 874e0112..8b5b070c 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -39,9 +39,8 @@ resource_registry:
   OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml
 
-
 parameter_defaults:
-  #NeutronExternalNetworkBridge: "''"
+  NeutronExternalNetworkBridge: 'br-ex'
   ControlPlaneSubnetCidr: "24"
   ControlPlaneDefaultRoute: 192.0.2.1
   ExternalNetCidr: 192.168.37.0/24
@@ -54,6 +53,13 @@ parameter_defaults:
   StorageNetCidr: 172.18.0.0/24
   StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}]
 
+  # Customize the VLAN IDs to match the local environment
+  InternalApiNetworkVlanID: 10 # usually collapsed onto Admin/Provisioning
+  StorageNetworkVlanID: 20
+  # StorageMgmtNetworkVlanID: 30 # NOT IMPLEMENTED
+  TenantNetworkVlanID: 40
+  ExternalNetworkVlanID: 50
+
 parameters:
   ServiceNetMap:
     NeutronTenantNetwork: tenant
@@ -74,6 +80,8 @@ parameters:
     NovaVncProxyNetwork: internal_api
     SwiftMgmtNetwork: storage
     SwiftProxyNetwork: storage
+    TackerApiNetwork: internal_api
+    CongressApiNetwork: internal_api
     HorizonNetwork: internal_api
     MemcachedNetwork: internal_api
     RabbitMqNetwork: internal_api