diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-04 09:38:49 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-04 09:39:27 -0500 |
| commit | eae61f596efd44095dbb78db6e7dd45d249cf77e (patch) | |
| tree | 80872f39651ec3dea028b806bbf521e1fe448ddb /ci | |
| parent | 91b4c1027454cabbc16c198fa88469e974a8065f (diff) | |
onos is compaitible with new definition of ext-port.
Change-Id: I1dd996e59faf488eaae258aba09140f4157d8837
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/bundle_tpl/neutron-gateway.yaml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml index 0780b6b8..74743ef7 100644 --- a/ci/bundle_tpl/neutron-gateway.yaml +++ b/ci/bundle_tpl/neutron-gateway.yaml @@ -16,18 +16,29 @@ data-port: br-ex:{{ opnfv.ext_port }} {% endif %} {% endif %} -{% else %} +{% elif os.network.controller == 'onos' %} + plugin: onos {% if opnfv.ext_port is defined %} - ext-port: {{ opnfv.ext_port }} +{% 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.controller == 'odl' %} - plugin: ovs-odl -{% elif os.network.controller == 'onos' %} - plugin: onos {% if os.network.sfc %} profile: onos-sfc {% endif %} +{% elif os.network.controller == 'odl' %} + plugin: ovs-odl +{% if opnfv.ext_port is defined %} + ext-port: {{ opnfv.ext_port }} +{% endif %} +{% else %} +{% if opnfv.ext_port is defined %} + ext-port: {{ opnfv.ext_port }} +{% endif %} {% endif %} instance-mtu: 1400 to: |