1 files changed, 23 insertions, 42 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 012d696d..525204e7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -1,19 +1,30 @@
     - [ 'nova-compute:amqp', 'rabbitmq-server:amqp' ]
+{% if os.network.controller != 'ocl' %}
     - [ 'neutron-gateway:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ]
+    - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ]
+    - [ 'heat:shared-db', 'mysql:shared-db' ]
+    - [ 'heat:identity-service', 'keystone:identity-service' ]
+    - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
+    - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
+    - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
+    - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
+    - [ 'ceilometer:shared-db', 'mongodb:database' ]
+{% endif %}
     - [ 'keystone:shared-db', 'mysql:shared-db' ]
     - [ 'nova-cloud-controller:identity-service', 'keystone:identity-service' ]
     - [ 'glance:identity-service', 'keystone:identity-service' ]
     - [ 'neutron-api:identity-service', 'keystone:identity-service' ]
     - [ 'neutron-api:shared-db', 'mysql:shared-db' ]
     - [ 'neutron-api:amqp', 'rabbitmq-server:amqp' ]
-    - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ]
     - [ 'glance:shared-db', 'mysql:shared-db' ]
     - [ 'glance:amqp', 'rabbitmq-server:amqp' ]
     - [ 'nova-cloud-controller:image-service', 'glance:image-service' ]
     - [ 'nova-compute:image-service', 'glance:image-service' ]
     - [ 'nova-cloud-controller:cloud-compute', 'nova-compute:cloud-compute' ]
     - [ 'nova-cloud-controller:amqp', 'rabbitmq-server:amqp' ]
-    - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ]
     - [ 'openstack-dashboard:identity-service', 'keystone:identity-service' ]
     - [ 'nova-cloud-controller:shared-db', 'mysql:shared-db' ]
     - [ 'nova-cloud-controller:neutron-api', 'neutron-api:neutron-api' ]
@@ -44,15 +55,6 @@
     - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
 {% endif %}
 {% endif %}
-    - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
-    - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
-    - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
-    - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
-    - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
-    - [ 'ceilometer:shared-db', 'mongodb:database' ]
-    - [ 'heat:shared-db', 'mysql:shared-db' ]
-    - [ 'heat:identity-service', 'keystone:identity-service' ]
-    - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
     - [ 'aodh:amqp', 'rabbitmq-server:amqp' ]
     - [ 'aodh:shared-db', 'mysql:shared-db' ]
     - [ 'aodh:identity-service', 'keystone:identity-service' ]
@@ -76,35 +78,14 @@
     - [ 'openvswitch-onos:ovsdb-manager', 'onos-controller:ovsdb-manager' ]
     - [ 'neutron-api-onos:onos-controller', 'onos-controller:controller-api' ]
 {% elif os.network.controller == 'ocl' %}
-    - [ 'kafka', 'zookeeper' ]
-    - [ 'contrail-configuration:cassandra', 'cassandra:database' ]
-    - [ 'contrail-configuration:contrail-analytics-api', 'contrail-analytics:contrail-analytics-api' ]
-    - [ 'contrail-configuration', 'zookeeper' ]
-    - [ 'contrail-configuration', 'rabbitmq-server' ]
-    - [ 'contrail-configuration', 'keystone' ]
-    - [ 'contrail-configuration', 'haproxy' ]
-    - [ 'contrail-analytics:cassandra', 'cassandra:database' ]
-    - [ 'contrail-analytics:contrail-api', 'contrail-configuration:contrail-api' ]
-    - [ 'contrail-analytics:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
-    - [ 'contrail-analytics', 'kafka' ]
-    - [ 'contrail-analytics', 'zookeeper' ]
-    - [ 'contrail-analytics', 'keystone' ]
-    - [ 'contrail-analytics', 'haproxy' ]
-    - [ 'contrail-control:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
-    - [ 'contrail-control:contrail-ifmap', 'contrail-configuration:contrail-ifmap' ]
-    - [ 'contrail-control:contrail-api', 'contrail-configuration:contrail-api' ]
-    - [ 'contrail-control', 'keystone' ]
-    - [ 'neutron-api-contrail', 'contrail-configuration' ]
-    - [ 'neutron-api-contrail', 'keystone' ]
-    - [ 'contrail-webui', 'keystone' ]
-    - [ 'contrail-webui:contrail_api', 'contrail-configuration:contrail-api' ]
-    - [ 'contrail-webui:contrail_discovery', 'contrail-configuration:contrail-discovery' ]
-    - [ 'contrail-webui:cassandra', 'cassandra:database' ]
-    - [ 'contrail-webui', 'haproxy' ]
-    - [ 'neutron-contrail', 'keystone' ]
-    - [ 'neutron-contrail:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
-    - [ 'neutron-contrail:contrail-api', 'contrail-configuration:contrail-api' ]
-    - [ 'haproxy', 'keepalived' ]
-    - [ 'ceilometer', 'ceilometer-contrail' ]
-    - [ 'ceilometer-contrail', 'contrail-analytics' ]
+    - [ 'contrail-keystone-auth', 'keystone' ]
+    - [ 'contrail-controller', 'contrail-keystone-auth' ]
+    - [ 'contrail-analytics', 'contrail-analyticsdb' ]
+    - [ 'contrail-controller', 'contrail-analytics' ]
+    - [ 'contrail-controller', 'contrail-analyticsdb' ]
+    - [ 'contrail-openstack', 'nova-compute' ]
+    - [ 'contrail-openstack', 'neutron-api' ]
+    - [ 'contrail-openstack', 'contrail-controller' ]
+    - [ 'contrail-agent:juju-info', 'nova-compute:juju-info' ]
+    - [ 'contrail-agent', 'contrail-controller']
 {% endif %}