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/relations.yaml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'ci/bundle_tpl/relations.yaml') diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml index 98b3d317..c2e12a98 100644 --- a/ci/bundle_tpl/relations.yaml +++ b/ci/bundle_tpl/relations.yaml @@ -100,12 +100,25 @@ - - neutron-openvswitch:neutron-plugin-api - neutron-api:neutron-plugin-api {% elif os.network.controller == 'odl' %} - - - nova-compute:neutron-plugin - - openvswitch-odl:neutron-plugin - - - neutron-gateway - - openvswitch-odl - - - openvswitch-odl:ovsdb-manager - - odl-controller:ovsdb-manager - - - neutron-api-odl:odl-controller - - odl-controller:controller-api + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-odl:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-odl:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-odl" + - - "openvswitch-odl:ovsdb-manager" + - "odl-controller:ovsdb-manager" + - - "neutron-api-odl:odl-controller" + - "odl-controller:controller-api" +{% elif os.network.controller == 'onos' %} + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-onos:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-onos:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-onos" + - - "openvswitch-onos:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api-onos:onos-controller" + - "onos-controller:controller-api" {% endif %} -- cgit 1.2.3-korg