diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-10-20 20:29:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-20 20:29:44 +0000 |
| commit | 4e0df0f248a8c1cdb301ac35e6bb2b308e031320 (patch) | |
| tree | a255361fbddf1c145e46e8a842ff91c15127e547 | |
| parent | 464e6740f6983cb60b49b3c5d5af5bc31eb55e69 (diff) | |
| parent | 71e6d415218ba10930752a0e241d670c6d5a8127 (diff) | |
Merge "Revert "Add ability to configure allowed vlan ranges in deploy configuration""
| -rw-r--r-- | config/network/network_settings.yaml | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index ee5537d9..ab9ed962 100644 --- 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 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: |