From 08aff60e052b5b697d8b4e53ef55c6827611999f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 18 Oct 2016 13:06:06 -0500 Subject: adding support for Newton and correct provide type. Change-Id: I98cc23946891c785b1056e5d1d9486ab2f591422 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml') diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index df60012c..2f9e9ab4 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -12,10 +12,10 @@ {% if os.network.controller == 'nosdn' %} {% if opnfv.ext_port is defined %} {% 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 }} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} {% else %} - bridge-mappings: external:br-ex + bridge-mappings: physnet1:br-ex data-port: br-ex:{{ opnfv.ext_port }} {% endif %} {% endif %} @@ -36,7 +36,13 @@ {% elif os.network.controller == 'odl' %} plugin: ovs-odl {% if opnfv.ext_port is defined %} - ext-port: {{ opnfv.ext_port }} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} +{% else %} + bridge-mappings: physnet1:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} {% endif %} {% else %} {% if opnfv.ext_port is defined %} -- cgit 1.2.3-korg