From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 4 Aug 2016 01:20:18 +0000 (-0500)
Subject: modified to use the openvswitch and gateway new way to define the
X-Git-Tag: colorado.1.0~49
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dee051b3960d1b2a4977fe9dd3c6b62460d69962;p=joid.git

modified to use the openvswitch and gateway new way to define the
external network with bridge-mapping and data-port

Change-Id: I99fbea5732a8a1aea323ea9dc98e4c8a2b72995f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index 6233421c..087783d8 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -15,7 +15,17 @@
 {% endif %}
 {% if opnfv.ext_port is defined  %}
 {% if os.network.dvr %}
-        ext-port: {{ opnfv.ext_port }}
+{% if os.network.controller == 'nosdn' %}
+{% if opnfv.data_port is defined  %}
+        bridge-mappings: physnet1:br-data external:br-ex
+        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
+{% else %}
+        bridge-mappings: external:br-ex
+        data-port: br-ex:{{ opnfv.ext_port }}
+{% endif %}
+{% else %}
+         ext-port: {{ opnfv.ext_port }}
+{% endif %}
 {% endif %}
 {% endif %}
 {# Empty block to avoid bad block trim #}