3 files changed, 16 insertions, 9 deletions
diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml
index f7523e7b..dd477bd2 100644
--- a/ci/config_tpl/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml
@@ -18,14 +18,15 @@
         vip: {{ opnfv.vip.neutron }}
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: physnet1
 {% elif os.network.controller == 'onos' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
 {% if os.beta.public_api %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
index ab58f5a7..dcd67346 100644
--- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
@@ -11,10 +11,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 %}
@@ -35,7 +35,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  %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
index 6823ca86..6c612819 100644
--- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
@@ -15,10 +15,10 @@
 {% if os.network.dvr %}
 {% 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 }}
+        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 %}
 {% else %}