summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-10-21 02:48:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-21 02:48:42 +0000
commit2ef6c8b51c353dd8a98ab9ae81f8e0c312434622 (patch)
tree264d4d371c98dfd8a1424eb2ecf5185eb08abffa /config
parentafe722d220b59cbd02afc65ec1ae6d508c72e1cf (diff)
parentf239be9ac62cbfea8f4f9051521c3cd8b15aa342 (diff)
Merge "Revert "Add ability to configure allowed vlan ranges in deploy configuration"" into stable/colorado
Diffstat (limited to 'config')
-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 5c9d644..f768064 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -57,7 +57,6 @@ private_network:
cidr: 11.0.0.0/24
compute_interface: nic2
controller_interface: nic2
- vlan_id_range: 1,1000 # Tenant physical network VLAN-ID range
# "public" network is used for external connectivity.
# The external network provides Internet access for virtual