diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-04 12:56:09 +0000 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-04 07:57:48 -0500 |
| commit | 91b4c1027454cabbc16c198fa88469e974a8065f (patch) | |
| tree | 32adcf46ba48b5811bf638c7e02a8fe25b1fe23c | |
| parent | 18d5c3cd3f45705d7a647f4b8bcf8bb48e8e7187 (diff) | |
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>
| -rw-r--r-- | ci/bundle_tpl/neutron-gateway.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
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' %} |