summaryrefslogtreecommitdiffstats
path: root/ci/bundle_tpl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-08-03 20:20:18 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-08-03 20:21:08 -0500
commitdee051b3960d1b2a4977fe9dd3c6b62460d69962 (patch)
tree6ee895a0da9c12febd65c3c5bf6fffda78000a6c /ci/bundle_tpl
parent4442a97ea68c07b073c847b1f61d0c5754a6fe13 (diff)
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>
Diffstat (limited to 'ci/bundle_tpl')
-rw-r--r--ci/bundle_tpl/neutron-ovs.yaml12
1 files changed, 11 insertions, 1 deletions
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 #}