diff options
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 16 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/relations.yaml | 9 |
2 files changed, 20 insertions, 5 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml index 49bd4f7d..33bbbd8a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml @@ -1,7 +1,17 @@ - mongodb: - charm: ./{{ ubuntu.release }}/mongodb + gnocchi: + charm: ./{{ ubuntu.release }}/gnocchi + num_units: 1 +{% if os.service.bindings %} + bindings: + "": *internal-space +{% endif %} + options: + openstack-origin: *openstack-origin + to: + - "lxd:nodes/0" + memcached: + charm: ./{{ ubuntu.release }}/memcached num_units: 1 - constraints: *oam-space-constr {% if os.service.bindings %} bindings: "": *internal-space diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index 2ed75e67..9fd234ff 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -5,10 +5,15 @@ - [ '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-service', 'keystone:identity-service' ] - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ] - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ] - - [ 'ceilometer:shared-db', 'mongodb:database' ] + - [ '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' ] + - [ 'ceilometer:identity-credentials', 'keystone:identity-credentials' ] {% endif %} - [ 'heat:shared-db', 'mysql:shared-db' ] - [ 'heat:identity-service', 'keystone:identity-service' ] |