summaryrefslogtreecommitdiffstats
path: root/config/network
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-10-20 20:29:44 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-20 20:29:44 +0000
commit4e0df0f248a8c1cdb301ac35e6bb2b308e031320 (patch)
treea255361fbddf1c145e46e8a842ff91c15127e547 /config/network
parent464e6740f6983cb60b49b3c5d5af5bc31eb55e69 (diff)
parent71e6d415218ba10930752a0e241d670c6d5a8127 (diff)
Merge "Revert "Add ability to configure allowed vlan ranges in deploy configuration""
Diffstat (limited to 'config/network')
-rw-r--r--config/network/network_settings.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index ee5537d9..ab9ed962 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -89,7 +89,6 @@ networks: # Network configurations
mtu: 64000 # Tenant network MTU
overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
# VNI, VLAN-ID, etc.
- vlan_id_range: 1,1000 # Tenant physical network VLAN-ID range
segmentation_type: vxlan # Tenant network segmentation type:
# vlan, vxlan, gre
nic_mapping: # Mapping of network configuration for Overcloud Nodes