From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 4 Aug 2016 05:25:41 +0000 (-0500)
Subject: since option is working in nosdn scenario so lets test for other
X-Git-Tag: colorado.1.0~48
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=18d5c3cd3f45705d7a647f4b8bcf8bb48e8e7187;p=joid.git

since option is working in nosdn scenario so lets test for other
deployments as well.

Change-Id: Ib88e6cc95f7fa65eb5791e36af6dd64ab2d97f72
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml
index 2148fd79..08b89d9f 100644
--- a/ci/bundle_tpl/neutron-gateway.yaml
+++ b/ci/bundle_tpl/neutron-gateway.yaml
@@ -6,7 +6,6 @@
 {% 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
@@ -16,9 +15,6 @@
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% endif %}
-{% else %}
-        ext-port: {{ opnfv.ext_port }}
-{% endif %}
 {% if os.network.controller == 'odl' %}
         plugin: ovs-odl
 {% elif os.network.controller == 'onos' %}