From 8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 28 Jun 2018 23:48:05 -0400 Subject: Add tenant vlan support Introduces tenant vlan support through configuration of network settings file. JIRA: APEX-272 Change-Id: Ie8e20a92ca4ebb9e0de4c53b5e03856d19ff660c Signed-off-by: Feng Pan --- build/nics-template.yaml.jinja2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'build/nics-template.yaml.jinja2') diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 073d6680..11e0b115 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -190,6 +190,18 @@ resources: name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} # force the MAC address of the bridge to this interface primary: true + {%- elif nets['tenant']['segmentation_type'] == 'vlan' %} + type: ovs_bridge + name: br-vlan + use_dhcp: false + addresses: + - + ip_netmask: {get_param: TenantIpSubnet} + members: + - + type: interface + name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} + primary: true {%- else %} - type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }} -- cgit 1.2.3-korg