From 91b4c1027454cabbc16c198fa88469e974a8065f Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 4 Aug 2016 12:56:09 +0000
Subject: Revert "since option is working in nosdn scenario so lets test for
other deployments as well."
This reverts commit 18d5c3cd3f45705d7a647f4b8bcf8bb48e8e7187.
Change-Id: Ie128515fb06e994cec72738b8500ec442a816b35
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
ci/bundle_tpl/neutron-gateway.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml
index 08b89d9f..0780b6b8 100644
--- a/ci/bundle_tpl/neutron-gateway.yaml
+++ b/ci/bundle_tpl/neutron-gateway.yaml
@@ -6,6 +6,7 @@
{% 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
@@ -15,6 +16,11 @@
data-port: br-ex:{{ opnfv.ext_port }}
{% endif %}
{% endif %}
+{% else %}
+{% if opnfv.ext_port is defined %}
+ ext-port: {{ opnfv.ext_port }}
+{% endif %}
+{% endif %}
{% if os.network.controller == 'odl' %}
plugin: ovs-odl
{% elif os.network.controller == 'onos' %}
--
cgit