Fixes datasource creation for congress

[apex.git] / build / network-environment.yaml

diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index 874e011..8b5b070 100644 (file)
--- 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