diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-10-21 02:48:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-21 02:48:42 +0000 |
| commit | 2ef6c8b51c353dd8a98ab9ae81f8e0c312434622 (patch) | |
| tree | 264d4d371c98dfd8a1424eb2ecf5185eb08abffa | |
| parent | afe722d220b59cbd02afc65ec1ae6d508c72e1cf (diff) | |
| parent | f239be9ac62cbfea8f4f9051521c3cd8b15aa342 (diff) | |
Merge "Revert "Add ability to configure allowed vlan ranges in deploy configuration"" into stable/colorado
| -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 5c9d644c..f7680643 100644 --- 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 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: |