From 62781fc5a43f756f00841cebe0b89d2a9d349ede Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 1 Jul 2016 09:02:24 -0500 Subject: modified to integrete ONOS. Change-Id: Ic787c583c36805aca13ec0a954b23d89a1addc8d Signed-off-by: Narinder Gupta --- ci/bundle_tpl/subordinate.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ci/bundle_tpl/subordinate.yaml') diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml index c84cdd72..645cd057 100644 --- a/ci/bundle_tpl/subordinate.yaml +++ b/ci/bundle_tpl/subordinate.yaml @@ -4,7 +4,8 @@ cinder-ceph: charm: local:{{ ubuntu.release }}/cinder-ceph {% endif %} -{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %} +{% if os.network.controller == 'nosdn' %} + {% include 'neutron-ovs.yaml' %} {% elif os.network.controller == 'odl' %} neutron-api-odl: charm: local:{{ ubuntu.release }}/neutron-api-odl @@ -14,13 +15,13 @@ openvswitch-odl: charm: local:{{ ubuntu.release }}/openvswitch-odl {% elif os.network.controller == 'nons' %} - openvswitch-onos: - charm: local:{{ ubuntu.release }}/openvswitch-onos neutron-api-onos: charm: local:{{ ubuntu.release }}/neutron-api-onos options: overlay-network-type: 'vxlan' security-groups: True + openvswitch-onos: + charm: local:{{ ubuntu.release }}/openvswitch-onos {% endif %} {% if os.lxd %} lxd: -- cgit 1.2.3-korg