From: Feng Pan <fpan@redhat.com>
Date: Tue, 13 Mar 2018 14:07:23 +0000 (+0000)
Subject: Merge "Enabling extra bridge for native external network"
X-Git-Tag: opnfv-6.0.0~18
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29367db39d60da9ba839e0ee2254b164fd43e2a1;hp=b83b80ebb8b1419d8fa39554fedbddfc92039b3c;p=apex.git

Merge "Enabling extra bridge for native external network"
---

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