summaryrefslogtreecommitdiffstats
path: root/lib/python/apex
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-10-21 00:27:45 +0000
committerFeng Pan <fpan@redhat.com>2016-10-21 00:27:45 +0000
commitf239be9ac62cbfea8f4f9051521c3cd8b15aa342 (patch)
tree49db9ef76541e7485e40481762813a8acbe2f908 /lib/python/apex
parentbb3dc933b7fd9e04fff5a73df8534494ad980ee7 (diff)
Revert "Add ability to configure allowed vlan ranges in deploy configuration"
This reverts commit bb3dc933b7fd9e04fff5a73df8534494ad980ee7.' Change-Id: If53a550dfc7ee15c5b4ee8cc50a6e94e4cff1415 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/python/apex')
-rw-r--r--lib/python/apex/network_environment.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index 61810d80..d96fa44e 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -126,12 +126,6 @@ class NetworkEnvironment(dict):
}]
priv_cidr = net_settings[PRIVATE_NETWORK]['cidr']
self[param_def]['TenantNetCidr'] = str(priv_cidr)
- if 'vlan_id_range' in net_settings[PRIVATE_NETWORK].keys():
- tenant_vlan_range = \
- net_settings[PRIVATE_NETWORK]['vlan_id_range'].split(',')
- self[param_def]['NeutronNetworkVLANRanges'] = \
- "datacentre:" + tenant_vlan_range[0] + ':' \
- + tenant_vlan_range[1]
if priv_cidr.version == 6:
postfix = '/tenant_v6.yaml'
else: