diff options
| author |   Peng Liu <pliu@redhat.com> | 2016-09-20 16:35:18 -0400 |
|---|---|---|
| committer | Peng Liu <pliu@redhat.com> | 2016-10-17 21:28:09 -0400 |
| commit | 3228f00248cda32671fb0e6a02059bea6ae66c99 (patch) | |
| tree | 79910990dfbcd739dbe8d4fab5c7574042bdaf46 | |
| parent | c6eeb47c4a497425bc9c2406063aef1fd57cc0c2 (diff) | |
Add ability to configure allowed vlan ranges in deploy configuration
Add a new parameter 'vlan_id_range' for tenant vlan range, which can
set the 'network_vlan_ranges' for 'datacentre' network in ml2.ini on
both compute and controller.
Change-Id: I5c190fb2d5d582d0d5f56d4c18cf32502b758bd8
JIRA: APEX-272
Signed-off-by: Peng Liu <pliu@redhat.com>
| -rw-r--r-- | config/network/network_settings.yaml | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index ab9ed962..ee5537d9 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -89,6 +89,7 @@ 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 5cb2d0cd..bbe8ee6b 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -116,6 +116,12 @@ 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: |