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 <dradez@redhat.com>

diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index ee5537d..ab9ed96 100644 (file)
--- 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

diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index bbe8ee6..5cb2d0c 100644 (file)
--- 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: