summaryrefslogtreecommitdiff
path: root/devstack/settings
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2017-10-16 11:31:51 +0200
committerJulien Danjou <julien@danjou.info>2017-10-25 14:38:43 +0200
commitd881dd52289d453b9f9d94c7c32c0672a70a8064 (patch)
tree3e8dba427d47ccaf28c5c16bfc20956d09e6a042 /devstack/settings
parent4b420650697c9c19029152ebce24e0c591f2d9c3 (diff)
downloadceilometer-d881dd52289d453b9f9d94c7c32c0672a70a8064.tar.gz
Remove Ceilometer API
This removes the deprecated Ceilometer API. Change-Id: I752b36b3dfe8f935b68c4d3d59ccb5b8b60c582f
Diffstat (limited to 'devstack/settings')
-rw-r--r--devstack/settings11
1 files changed, 1 insertions, 10 deletions
diff --git a/devstack/settings b/devstack/settings
index 7c2bfb3c..b2768eed 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -11,11 +11,8 @@ CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf
CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer}
CEILOMETER_WSGI_DIR=${CEILOMETER_WSGI_DIR:-/var/www/ceilometer}
-# Set up no backend
CEILOMETER_BACKEND=${CEILOMETER_BACKEND:-gnocchi}
-if [ "$CEILOMETER_BACKEND" = "es" ] || [ "$CEILOMETER_BACKEND" = "mysql" ] || [ "$CEILOMETER_BACKEND" = "postgresql" ] || [ "$CEILOMETER_BACKEND" = "mongodb" ]; then
- enable_service ceilometer-api
-elif [ "$CEILOMETER_BACKEND" = "gnocchi" ]; then
+if [ "$CEILOMETER_BACKEND" = "gnocchi" ]; then
enable_service gnocchi-api gnocchi-metricd
fi
@@ -38,12 +35,6 @@ GNOCCHI_WSGI_DIR=${GNOCCHI_WSGI_DIR:-/var/www/gnocchi}
# when the gate job have overrided this.
CEILOMETER_ALARM_GRANULARITY=${CEILOMETER_ALARM_GRANULARITY:-60}
-# Ceilometer connection info.
-CEILOMETER_SERVICE_PROTOCOL=http
-CEILOMETER_SERVICE_HOST=${CEILOMETER_SERVICE_HOST:-${SERVICE_HOST}}
-CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777}
-CEILOMETER_USE_MOD_WSGI=${CEILOMETER_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}
-
# To enable OSprofiler change value of this variable to "notifications,profiler"
CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications}