diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-29 22:06:03 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-29 22:42:14 -0500 |
| commit | f258a7449d73f54f6bae7089d59c030cdbed780c (patch) | |
| tree | edb4c57691299553f9b9af73d9833411ee321562 /ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | |
| parent | c2c31d6bb5633d999f130b6be56584a9ecf338e6 (diff) | |
modified to use latest Carbon build release.
Change-Id: I1e037c9f76032db68d516a33007d54f02a19d883
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 92be0418..9938bf13 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -27,16 +27,6 @@ #default-socket-cores: 1 {% endif %} {% if opnfv.ext_port is defined %} -{% if os.network.controller == 'nosdn' %} -{% 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 %} -{% else %} - ext-port: {{ opnfv.ext_port }} -{% endif %} + bridge-mappings: physnet1:br-data {% endif %} {# Empty block to avoid bad block trim #} |