integrate gnocchi with cloudkitty

Closes-Bug: #1630947

Change-Id: Ie28ec6399add384962cfdcf83c93c3bef132d57e
This commit is contained in:
zhubingbing 2016-10-06 12:40:39 +00:00
parent b58147bcc0
commit e7df182461
3 changed files with 17 additions and 1 deletions

View File

@ -353,6 +353,14 @@ ceilometer_database_type: "mongodb"
################################# #################################
cinder_backend_ceph: "{{ enable_ceph }}" cinder_backend_ceph: "{{ enable_ceph }}"
#######################
# Cloudkitty options
#######################
# Valid options are [ ceilometer, gnocchi ]
cloudkitty_collector_backend: "ceilometer"
####################### #######################
# Nova options # Nova options
####################### #######################

View File

@ -27,7 +27,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
lock_path = /var/lib/cloudkitty/tmp lock_path = /var/lib/cloudkitty/tmp
[collect] [collect]
collector = ceilometer collector = {{ cloudkitty_collector_backend }}
services = compute,image{% if enable_cinder | bool %},volume{% endif %}, network_bw_out, network_bw_in, network_floating services = compute,image{% if enable_cinder | bool %},volume{% endif %}, network_bw_out, network_bw_in, network_floating
[oslo_messaging_notifications] [oslo_messaging_notifications]
@ -38,8 +38,13 @@ topics = notifications
keystone_version = 3 keystone_version = 3
auth_section = keystone_authtoken auth_section = keystone_authtoken
{% if cloudkitty_collector_backend == "gnocchi" %}
[gnocchi_collector]
auth_section = keystone_authtoken
{% elif cloudkitty_collector_backend == "ceilometer" %}
[ceilometer_collector] [ceilometer_collector]
auth_section = keystone_authtoken auth_section = keystone_authtoken
{% endif %}
[api] [api]
host_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} host_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}

View File

@ -0,0 +1,3 @@
---
features:
- support use gnocchi collector in cloudkitty