diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-19 10:02:50 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-19 11:43:46 -0600 |
| commit | 0cd6c7dac297478d5dd66313aef09e5e5324d2ad (patch) | |
| tree | 9e5ff2f4d4e03f1196c8ffc7c6785045bcc5f86c /ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | |
| parent | bbd5aa8591fb02f6c73217df81108d43cfc747b4 (diff) | |
modfiied to support the new spaces in juju.
Change-Id: I4938bb53b0172ebde9a110d7ac6a0725064aa5ca
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 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index d12f3257..c73f3721 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -1,11 +1,15 @@ neutron-openvswitch: charm: ./{{ ubuntu.release }}/neutron-openvswitch - options: {% if opnfv.spaces_dict.data is defined %} {% if os.service.bindings %} bindings: data: admin-api + options: +{% else %} + options: {% endif %} +{% else %} + options: {% endif %} {% if os.network.dpdk %} enable-dpdk: true @@ -24,7 +28,7 @@ data-port: br-ex:{{ opnfv.ext_port }} {% endif %} {% else %} - ext-port: {{ opnfv.ext_port }} + ext-port: {{ opnfv.ext_port }} {% endif %} {% endif %} {# Empty block to avoid bad block trim #} |