openstack
/
cloudkitty
Code Issues Proposed changes

Merge "devstack: support the gnocchi collector"

This commit is contained in:
Jenkins 2017-01-02 11:58:03 +00:00 committed by Gerrit Code Review
parent fd590827e0 f9a16c5d50
commit 4b8d5dcfa6
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -120,10 +120,9 @@ function configure_cloudkitty {
iniset $CLOUDKITTY_CONF keystone_fetcher auth_section authinfos
iniset $CLOUDKITTY_CONF keystone_fetcher keystone_version 3
iniset $CLOUDKITTY_CONF ceilometer_collector auth_section authinfos
# collect
iniset $CLOUDKITTY_CONF collect collector $CLOUDKITTY_COLLECTOR
iniset $CLOUDKITTY_CONF ${CLOUDKITTY_COLLECTOR}_collector auth_section authinfos
iniset $CLOUDKITTY_CONF collect services $CLOUDKITTY_SERVICES
# output

29
doc/source/devstack.rst
View File

@ -2,8 +2,8 @@
DevStack installation
#####################
The installation of CloudKitty from DevStack is pretty straightforward. Just
add the following lines to your local.conf file.
Add the following lines in your ``local.conf`` file to enable CloudKitty with
the ceilometer collector:
::
@ -17,8 +17,31 @@ add the following lines to your local.conf file.
# cloudkitty
enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty.git master
enable_service ck-api ck-proc
CLOUDKITTY_COLLECTOR=ceilometer
Then, you can start devstack.
To enable the gnocchi collector, use the following instead:
::
[[local|localrc]]
# gnocchi
enable_plugin gnocchi https://github.com/openstack/gnocchi master
enable_service gnocchi-api,gnocchi-metricd
# ceilometer
enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
# horizon
enable_service horizon
# cloudkitty
enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty.git master
enable_service ck-api ck-proc
CLOUDKITTY_COLLECTOR=gnocchi
Then start devstack:
::