diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 18:58:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 18:58:11 +0000 |
| commit | 2840a7db67fdaf58567c195557c6fb8ee38f73bd (patch) | |
| tree | 1beb8f677649ca6d1bf670ab4eca175fcdd5b60a /build/network-environment.yaml | |
| parent | c5ea99b97d53ddb8451be21ffed5118125457cca (diff) | |
| parent | 890ed0bcb03b61c5e5da596f89771d6196cd4231 (diff) | |
Merge changes from topics 'fix_dpdk', 'vlan_support'
* changes:
Fixes IP failure during os-collect-config ping check
Adding VLAN support
Diffstat (limited to 'build/network-environment.yaml')
| -rw-r--r-- | build/network-environment.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 874e0112..baf8b187 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -54,6 +54,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 |