diff options
author | Tim Rozet <trozet@redhat.com> | 2018-07-20 00:24:47 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-07-20 00:24:47 +0000 |
commit | 82a9bec67b094f6381acb035a9efeffe47b011ab (patch) | |
tree | eb300e2d526b919f2eb0953e3a4a61cf285d4496 /build/nics-template.yaml.jinja2 | |
parent | 48d1c6885afe72c92d07204cdfc97829ce9d24ed (diff) | |
parent | 8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba (diff) |
Merge "Add tenant vlan support"
Diffstat (limited to 'build/nics-template.yaml.jinja2')
-rw-r--r-- | build/nics-template.yaml.jinja2 | 12 |
1 files changed, 12 insertions, 0 deletions
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'] }} |