From 4442a97ea68c07b073c847b1f61d0c5754a6fe13 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 3 Aug 2016 14:44:55 -0500 Subject: replace ext-port with data-port and bridge-map. Change-Id: I7d89f57b4952d3054defb12b8e24360ea39cc91c Signed-off-by: Narinder Gupta --- ci/bundle_tpl/neutron-gateway.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ci/bundle_tpl/neutron-gateway.yaml') diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml index fd627642..2148fd79 100644 --- a/ci/bundle_tpl/neutron-gateway.yaml +++ b/ci/bundle_tpl/neutron-gateway.yaml @@ -3,8 +3,20 @@ options: {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% else %} + #os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} +{% 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 }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} +{% else %} ext-port: {{ opnfv.ext_port }} {% endif %} {% if os.network.controller == 'odl' %} -- cgit 1.2.3-korg