diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-30 14:26:11 +0000 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-30 14:26:11 +0000 |
| commit | 266e1857937d44a0f5a290cc13a8de5bff50eba3 (patch) | |
| tree | 76786a105f9e9bdc3cb8531531995c37e547b1c4 /ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | |
| parent | f258a7449d73f54f6bae7089d59c030cdbed780c (diff) | |
Revert "modified to use latest Carbon build release."
This reverts commit f258a7449d73f54f6bae7089d59c030cdbed780c.
Change-Id: Ia9890a11a9ffd6fb3fb5bff53868f956342eaa0f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index 0e56142e..f8a3f91a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -18,17 +18,45 @@ {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} +{% if os.network.controller == 'nosdn' %} {% if opnfv.ext_port is defined %} - bridge-mappings: physnet1:br-data - data-port: br-data:{{ 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 %} -{% if os.network.controller == 'onos' %} +{% elif os.network.controller == 'onos' %} plugin: onos +{% 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 }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} {% if os.network.sfc %} profile: onos-sfc {% endif %} {% elif os.network.controller == 'odl' %} plugin: ovs-odl +{% if opnfv.ext_port is defined %} +{% 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 %} + ext-port: {{ opnfv.ext_port }} +{% endif %} {% endif %} instance-mtu: 1400 to: |