diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-18 13:06:06 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-18 13:35:10 -0500 |
| commit | 08aff60e052b5b697d8b4e53ef55c6827611999f (patch) | |
| tree | 335d632cf9b447ff4b0b7ce19cd619338f85a3c9 /ci/config_tpl/juju2 | |
| parent | e9d7bab1c99f0c5cbac1265d3cbd661bc9c62dbc (diff) | |
adding support for Newton and correct provide type.
Change-Id: I98cc23946891c785b1056e5d1d9486ab2f591422
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 5 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 14 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index 934e4660..420a0af4 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -18,14 +18,15 @@ vip: {{ opnfv.vip.neutron }} {% endif %} {% if os.network.controller == 'nosdn' %} - flat-network-providers: "*" + flat-network-providers: physnet1 {% if os.network.dvr %} overlay-network-type: vxlan {% endif %} {% elif os.network.controller == 'odl' %} manage-neutron-plugin-legacy-mode: False + flat-network-providers: physnet1 {% elif os.network.controller == 'onos' %} - flat-network-providers: "*" + flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index df60012c..2f9e9ab4 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -12,10 +12,10 @@ {% 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 - data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} {% else %} - bridge-mappings: external:br-ex + bridge-mappings: physnet1:br-ex data-port: br-ex:{{ opnfv.ext_port }} {% endif %} {% endif %} @@ -36,7 +36,13 @@ {% elif os.network.controller == 'odl' %} plugin: ovs-odl {% if opnfv.ext_port is defined %} - ext-port: {{ 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 %} {% else %} {% if opnfv.ext_port is defined %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 286132b5..266ac709 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -15,10 +15,10 @@ {% if os.network.dvr %} {% if os.network.controller == 'nosdn' %} {% 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 }} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} {% else %} - bridge-mappings: external:br-ex + bridge-mappings: physnet1:br-ex data-port: br-ex:{{ opnfv.ext_port }} {% endif %} {% else %} |