From 71e6d415218ba10930752a0e241d670c6d5a8127 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 20 Oct 2016 20:28:57 +0000 Subject: Revert "Add ability to configure allowed vlan ranges in deploy configuration" This reverts commit 3228f00248cda32671fb0e6a02059bea6ae66c99. There is more settings that will need to added for the functionality this patch it intending to add. The JIRA will be updated and the feature will be worked on for Danube. Change-Id: I258ba552cbb49e6fa188a8dffe860e8dac2e3f5f Signed-off-by: Dan Radez --- lib/python/apex/network_environment.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lib') diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index bbe8ee6b..5cb2d0cd 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -116,12 +116,6 @@ class NetworkEnvironment(dict): 'end': str(tenant_range[1])}] tenant_cidr = nets[TENANT_NETWORK]['cidr'] self[param_def]['TenantNetCidr'] = str(tenant_cidr) - if 'vlan_id_range' in nets[TENANT_NETWORK].keys(): - tenant_vlan_range = \ - nets[TENANT_NETWORK]['vlan_id_range'].split(',') - self[param_def]['NeutronNetworkVLANRanges'] = \ - "datacentre:" + tenant_vlan_range[0] + ':' \ - + tenant_vlan_range[1] if tenant_cidr.version == 6: postfix = '/tenant_v6.yaml' else: -- cgit 1.2.3-korg