added ssl support based on default.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 7d7f41b..04ce15e 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -1,19 +1,36 @@
     - [ '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' ]
+    - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
+    - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
+    - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
+    - [ 'ceilometer:identity-credentials', 'keystone:identity-credentials' ]
+    - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
+    - [ 'gnocchi:storage-ceph', 'ceph-mon:client' ]
+    - [ 'gnocchi:shared-db', 'mysql:shared-db' ]
+    - [ 'gnocchi:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'gnocchi:coordinator-memcached', 'memcached:cache' ]
+    - [ 'gnocchi:metric-service', 'ceilometer:metric-service' ]
+    - [ 'gnocchi:identity-service', 'keystone:identity-service' ]
+{% endif %}
+    - [ 'heat:shared-db', 'mysql:shared-db' ]
+    - [ 'heat:identity-service', 'keystone:identity-service' ]
+    - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
     - [ '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' ]
@@ -32,6 +49,7 @@
     - [ 'nova-compute:ephemeral-backend', 'scaleio-openstack:ephemeral-backend' ]
 {% else %}
     - [ 'cinder-ceph:storage-backend', 'cinder:storage-backend' ]
+    - [ 'nova-compute:ceph-access', 'cinder-ceph:ceph-access' ]
     - [ 'ceph-mon:client', 'nova-compute:ceph' ]
     - [ 'ceph-mon:client', 'cinder-ceph:ceph' ]
     - [ 'ceph-mon:client', 'glance:ceph' ]
@@ -44,18 +62,14 @@
     - [ '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' ]
+    - [ designate, mysql ]
+    - [ designate, designate-bind ]
+    - [ designate, keystone ]
+    - [ designate, rabbitmq-server ]
+    - [ designate, memcached ]
 {% if os.lxd %}
     - [ 'nova-compute:lxd', 'lxd:lxd' ]
 {% endif %}