diff options
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/bundle.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/relations.yaml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml index 507241af..c9e8bdf8 100644 --- a/ci/config_tpl/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/bundle_tpl/bundle.yaml @@ -46,8 +46,10 @@ openstack-phase1: {% endif %} {% include 'cinder.yaml' %} {% include 'glance.yaml' %} +{% if opnfv.storage_dict.ceph is defined %} {% include 'opnfv-promise.yaml' %} {% include 'congress.yaml' %} +{% endif %} {% include 'keystone.yaml' %} {% include 'nova-cloud-controller.yaml' %} {% include 'nova-compute.yaml' %} diff --git a/ci/config_tpl/bundle_tpl/relations.yaml b/ci/config_tpl/bundle_tpl/relations.yaml index 7b925f6d..8dd64759 100644 --- a/ci/config_tpl/bundle_tpl/relations.yaml +++ b/ci/config_tpl/bundle_tpl/relations.yaml @@ -38,6 +38,9 @@ - [ 'ceph-osd:mon', 'ceph:osd' ] - [ 'ceph-radosgw:mon', 'ceph:radosgw' ] - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ] + - [ 'congress:shared-db', 'mysql:shared-db' ] + - [ 'congress:identity-service', 'keystone:identity-service' ] + - [ 'congress:amqp', 'rabbitmq-server:amqp' ] {% endif %} - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ] - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ] @@ -48,9 +51,6 @@ - [ 'heat:shared-db', 'mysql:shared-db' ] - [ 'heat:identity-service', 'keystone:identity-service' ] - [ 'heat:amqp', 'rabbitmq-server:amqp' ] - - [ 'congress:shared-db', 'mysql:shared-db' ] - - [ 'congress:identity-service', 'keystone:identity-service' ] - - [ 'congress:amqp', 'rabbitmq-server:amqp' ] - [ 'aodh:amqp', 'rabbitmq-server:amqp' ] - [ 'aodh:shared-db', 'mysql:shared-db' ] - [ 'aodh:identity-service', 'keystone:identity-service' ] |