From e7df18246106806c6ce4f39c6069e0f780a5f716 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Thu, 6 Oct 2016 12:40:39 +0000
Subject: [PATCH] integrate gnocchi with cloudkitty

Closes-Bug: #1630947

Change-Id: Ie28ec6399add384962cfdcf83c93c3bef132d57e
---
 ansible/group_vars/all.yml                                | 8 ++++++++
 ansible/roles/cloudkitty/templates/cloudkitty.conf.j2     | 7 ++++++-
 .../integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml    | 3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 71f86f5d9e..a555dec7a0 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -353,6 +353,14 @@ ceilometer_database_type: "mongodb"
 #################################
 cinder_backend_ceph: "{{ enable_ceph }}"
 
+
+#######################
+# Cloudkitty options
+#######################
+# Valid options are [ ceilometer, gnocchi ]
+cloudkitty_collector_backend: "ceilometer"
+
+
 #######################
 # Nova options
 #######################
diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
index 5de3eeb0b9..cd347b2697 100644
--- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
+++ b/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'] }}
diff --git a/releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml b/releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml
new file mode 100644
index 0000000000..cf163fa2ed
--- /dev/null
+++ b/releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - support use gnocchi collector in cloudkitty