summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-01-23 14:53:20 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-01-24 22:32:23 -0600
commit719d8dcd66ddb05c0845276a1a2b8c03683def90 (patch)
treeae5166233dc76d74f5feef3a1d2f2fa2b68fab79 /ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
parent6b74031e2bd37ed40d24fab4139c035740f06dd0 (diff)
modfied to use latest charm currently.
Change-Id: I6109fed4861f3d9656adc698b6de6d7143fa6988 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.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index c73f3721..1dd2210d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -1,15 +1,20 @@
neutron-openvswitch:
charm: ./{{ ubuntu.release }}/neutron-openvswitch
-{% if opnfv.spaces_dict.data is defined %}
{% if os.service.bindings %}
+{% if opnfv.spaces_dict.data is defined %}
bindings:
data: admin-api
options:
{% else %}
+ bindings:
+ data: internal-api
options:
{% endif %}
{% else %}
options:
+{% if opnfv.spaces_dict.data is defined %}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true