summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-03-13 14:07:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-13 14:07:23 +0000
commit29367db39d60da9ba839e0ee2254b164fd43e2a1 (patch)
treef7700d9e4d14a9ae5058d1e7d65317574137537c
parentb83b80ebb8b1419d8fa39554fedbddfc92039b3c (diff)
parent8ed6771038060ee0057dab56c5ec95d6c8b8e49f (diff)
Merge "Enabling extra bridge for native external network"
-rw-r--r--build/nics-template.yaml.jinja24
1 files changed, 4 insertions, 0 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 93d3dc14..b1069d2c 100644
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -87,7 +87,11 @@ resources:
-
{%- if not nets['external'][0]['enabled'] or nets['tenant']['nic_mapping'][role]['vlan'] is number or nets['storage']['nic_mapping'][role]['vlan'] is number or nets['api']['nic_mapping'][role]['vlan'] is number or nets['external'][0]['nic_mapping'][role]['vlan'] is number %}
type: ovs_bridge
+ {%- if nets['external'][0]['enabled'] and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %}
+ name: br-isolated
+ {%- else %}
name: {get_input: bridge_name}
+ {%- endif %}
members:
-
type: interface