modify the lab definition as per new changes.

[joid.git] / ci / bundle_tpl / relations.yaml

diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index ddfa2fe..690cdb0 100644 (file)
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -1,27 +1,3 @@
-{% if os.ha.mode == 'ha' %}
-    - - mysql:ha
-      - hacluster-mysql:ha
-    - - cinder:ha
-      - hacluster-cinder:ha
-    - - heat:ha
-      - hacluster-heat:ha
-    - - glance:ha
-      - hacluster-glance:ha
-    - - keystone:ha
-      - hacluster-keystone:ha
-    - - neutron-api:ha
-      - hacluster-neutron:ha
-    - - nova-cloud-controller:ha
-      - hacluster-nova:ha
-    - - openstack-dashboard:ha
-      - hacluster-horizon:ha
-    - - heat:ha
-      - hacluster-heat:ha
-{% if os.beta.hacluster_ceph_radosgw %}
-    - - ceph-radosgw:ha
-      - hacluster-ceph-radosgw:ha
-{% endif %}
-{% endif %}
     - - nova-compute:amqp
       - rabbitmq-server:amqp
     - - neutron-gateway:amqp
@@ -113,23 +89,51 @@
     - - congress:amqp
       - rabbitmq-server:amqp
 {% if os.lxd %}
-    - - nova-compute:lxd
-      - lxd:lxd
+    - [ 'nova-compute:lxd', 'lxd:lxd' ]
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
+    - [ 'neutron-openvswitch:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'nova-compute:neutron-plugin', 'neutron-openvswitch:neutron-plugin' ]
+    - [ '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' ]
+{% elif os.network.controller == 'ocl' %}
+    - [ 'contrail-configuration:cassandra', 'cassandra:database' ]
+    - [ 'contrail-configuration', 'zookeeper' ]
+    - [ 'contrail-configuration', 'rabbitmq-server' ]
+    - [ 'contrail-configuration', 'keystone' ]
+    - [ 'neutron-api-contrail', 'contrail-configuration' ]
+    - [ 'neutron-api-contrail', 'keystone' ]
+    - [ 'contrail-control:contrail-api', 'contrail-configuration:contrail-api' ]
+    - [ 'contrail-control:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
+    - [ 'contrail-control:contrail-ifmap', 'contrail-configuration:contrail-ifmap' ]
+    - [ 'contrail-control', 'keystone' ]
+    - [ 'contrail-analytics:cassandra', 'cassandra:database' ]
+    - [ 'contrail-analytics:contrail-analytics-api', 'contrail-configuration:contrail-analytics-api' ]
+    - [ 'contrail-configuration:contrail-discovery', 'contrail-analytics:contrail-discovery' ]
+    - [ 'contrail-webui', 'keystone' ]
+    - [ 'contrail-webui:contrail_api', 'contrail-configuration:contrail-api' ]
+    - [ 'contrail-webui:contrail_discovery', 'contrail-configuration:contrail-discovery' ]
+    - [ 'contrail-webui:cassandra', 'cassandra:database' ]
+    - [ 'nova-compute', 'neutron-contrail' ]
+    - [ 'neutron-contrail:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
+    - [ 'neutron-contrail:contrail-api', 'contrail-configuration:contrail-api' ]
+    - [ 'neutron-contrail', 'keystone' ]
+    - [ 'contrail-configuration', 'ntp' ]
+    - [ 'contrail-control', 'ntp' ]
+    - [ 'contrail-analytics', 'ntp' ]
+    - [ 'contrail-configuration', 'haproxy' ]
+    - [ 'contrail-analytics', 'haproxy' ]
+    - [ 'contrail-webui', 'haproxy' ]
+    - [ 'haproxy', 'keepalived' ]
 {% endif %}