Merge "Revert "Add ability to configure allowed vlan ranges in deploy configuration...

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

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