summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml12
1 files changed, 1 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 92be0418..9938bf13 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -27,16 +27,6 @@
#default-socket-cores: 1
{% endif %}
{% if opnfv.ext_port is defined %}
-{% if os.network.controller == 'nosdn' %}
-{% 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 %}
-{% else %}
- ext-port: {{ opnfv.ext_port }}
-{% endif %}
+ bridge-mappings: physnet1:br-data
{% endif %}
{# Empty block to avoid bad block trim #}