diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-10 06:47:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-10 06:47:41 +0000 |
| commit | 5a427a941f1101d24b537c1b5e71ec82a3087a97 (patch) | |
| tree | 79a473c24d1c5e76692e0bab7a5ca630b0fb39a7 | |
| parent | ff3813e7805d72718dbaaa3256b8de8a01bd0010 (diff) | |
| parent | e7df18246106806c6ce4f39c6069e0f780a5f716 (diff) | |
| download | kolla-5a427a941f1101d24b537c1b5e71ec82a3087a97.tar.gz kolla-5a427a941f1101d24b537c1b5e71ec82a3087a97.zip | |
Merge "integrate gnocchi with cloudkitty"
| -rw-r--r-- | ansible/group_vars/all.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 | 7 | ||||
| -rw-r--r-- | releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 9085a74ed..55feff1d5 100644 --- a/ansible/group_vars/all.yml +++ b/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 ####################### diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 index 5de3eeb0b..cd347b269 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 000000000..cf163fa2e --- /dev/null +++ b/releasenotes/notes/integrate-gnocchi-cloudkitty-4b2fcfe8ce9d520e.yaml @@ -0,0 +1,3 @@ +--- +features: + - support use gnocchi collector in cloudkitty |