summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/relations.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/relations.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/relations.yaml18
1 files changed, 6 insertions, 12 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 00c460b0..012d696d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -6,14 +6,14 @@
- [ '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' ]
+ - [ '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' ]
- - [ 'neutron-gateway', 'nova-cloud-controller' ]
+ - [ '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' ]
@@ -45,16 +45,11 @@
{% 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' ]
- - [ 'ceilometer-agent', 'nova-compute' ]
- - [ 'ceilometer-agent', 'ceilometer' ]
- - [ 'ceilometer-agent', 'glance' ]
- - [ 'ceilometer-agent', 'heat' ]
- - [ 'ceilometer-agent', 'cinder' ]
- - [ 'ceilometer-agent', 'neutron-api' ]
- - [ 'ceilometer-agent', 'nova-cloud-controller' ]
- [ 'heat:shared-db', 'mysql:shared-db' ]
- [ 'heat:identity-service', 'keystone:identity-service' ]
- [ 'heat:amqp', 'rabbitmq-server:amqp' ]
@@ -66,9 +61,8 @@
{% endif %}
{% if os.network.controller == 'nosdn' %}
- [ 'neutron-openvswitch:amqp', 'rabbitmq-server:amqp' ]
- - [ 'neutron-openvswitch', 'rabbitmq-server' ]
- - [ 'neutron-openvswitch', 'neutron-api' ]
- - [ 'nova-compute', 'neutron-openvswitch' ]
+ - [ 'nova-compute:neutron-plugin', 'neutron-openvswitch:neutron-plugin' ]
+ - [ 'neutron-openvswitch:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ]
{% elif os.network.controller == 'odl' %}
- [ 'neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate' ]
- [ 'nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin' ]