diff options
| author | Julien Danjou <julien@danjou.info> | 2017-05-29 12:21:03 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2017-06-07 17:50:23 +0200 |
| commit | 898117902437cded9d8150ffa42869a02e3765d8 (patch) | |
| tree | 4d5f8f35b27201d0f80a28146fdf6b72a766bec9 /devstack/settings | |
| parent | bf56827dce2bb0c3c7dabecb640269dc3887f47b (diff) | |
| download | ceilometer-898117902437cded9d8150ffa42869a02e3765d8.tar.gz | |
devstack: install Gnocchi using pip
Depends-On: I7a7bc3deeadd094d7a42b47b16cde2e8a8805a24
Change-Id: I55193f2e39a41fe2bb378b4380f2ae52c5685c8d
Diffstat (limited to 'devstack/settings')
| -rw-r--r-- | devstack/settings | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/devstack/settings b/devstack/settings index b7299e2d..1fd6dbf3 100644 --- a/devstack/settings +++ b/devstack/settings @@ -15,10 +15,25 @@ CEILOMETER_WSGI_DIR=${CEILOMETER_WSGI_DIR:-/var/www/ceilometer} CEILOMETER_BACKEND=${CEILOMETER_BACKEND:-none} if [ "$CEILOMETER_BACKEND" = "es" ] || [ "$CEILOMETER_BACKEND" = "mysql" ] || [ "$CEILOMETER_BACKEND" = "postgresql" ] || [ "$CEILOMETER_BACKEND" = "mongodb" ]; then enable_service ceilometer-api +elif [ "$CEILOMETER_BACKEND" = "gnocchi" ]; then + enable_service gnocchi-api gnocchi-metricd fi # Gnocchi default archive_policy for Ceilometer +# TODO(sileht): when Gnocchi 4.0 is out use the tarball instead +GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi#egg=gnocchi} GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low} +GNOCCHI_CONF_DIR=${GNOCCHI_CONF_DIR:-/etc/gnocchi} +GNOCCHI_CONF=${GNOCCHI_CONF:-${GNOCCHI_CONF_DIR}/gnocchi.conf} +GNOCCHI_COORDINATOR_URL=${CEILOMETER_COORDINATOR_URL:-redis://localhost:6379} +GNOCCHI_METRICD_PROCESSING_DELAY=${GNOCCHI_METRICD_PROCESSING_DELAY:-5} +GNOCCHI_AUTH_CACHE_DIR=${GNOCCHI_AUTH_CACHE_DIR:-/var/cache/gnocchi} + +GNOCCHI_UWSGI_FILE=${GNOCCHI_UWSGI_FILE:-${GNOCCHI_CONF_DIR}/uwsgi.ini} +GNOCCHI_SERVICE_PROTOCOL=http +GNOCCHI_SERVICE_HOST=${GNOCCHI_SERVICE_HOST:-${SERVICE_HOST}} +GNOCCHI_WSGI_DIR=${GNOCCHI_WSGI_DIR:-/var/www/gnocchi} + # FIXME(sileht): put 300 by default to match the archive policy # when the gate job have overrided this. CEILOMETER_ALARM_GRANULARITY=${CEILOMETER_ALARM_GRANULARITY:-60} @@ -56,18 +71,6 @@ function _ceilometer_check_for_storage { local plugins="${DEVSTACK_PLUGINS}" local plugin - if [ "$CEILOMETER_BACKEND" == 'gnocchi' ]; then - local seen_gnocchi=False - - for plugin in ${plugins//,/ }; do - if [ "$plugin" == 'gnocchi' ]; then - seen_gnocchi=True - elif [ "$plugin" == 'ceilometer' ] && [ "$seen_gnocchi" == 'False' ]; then - die $LINENO "gnocchi must be enabled before ceilometer!" - fi - done - fi - local seen_ceilometer=False for plugin in ${plugins//,/ }; do |