Merge "integrate gnocchi with cloudkitty"

ansible/group_vars/all.yml

@@ -360,6 +360,14 @@ gnocchi_backend_storage: "{{ 'ceph' if enable_ceph|bool else 'file' }}"
 #################################
 cinder_backend_ceph: "{{ enable_ceph }}"
 
+
+#######################
+# Cloudkitty options
+#######################
+# Valid options are [ ceilometer, gnocchi ]
+cloudkitty_collector_backend: "ceilometer"
+
+
 #######################
 # Nova options
 #######################

ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

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

releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml

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