diff options
| author | Julien Danjou <julien@danjou.info> | 2016-12-12 19:06:30 +0100 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2017-01-06 16:33:53 +0100 |
| commit | 8d23f431ab0bd638edbf2197e56bea68d7b06a21 (patch) | |
| tree | c35c4e6574c401aeb59a71ed345d82d42be5346f /devstack | |
| parent | 407b726fc2ba76a7a149a8722b7cf9b09d8dc0d3 (diff) | |
| download | ceilometer-8d23f431ab0bd638edbf2197e56bea68d7b06a21.tar.gz | |
Remove events storage and API
This now has been moved to Panko.
Change-Id: I179eb0d436752e3bb8abaed714664cf74f5615e6
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f8c2ab9c..3d961551 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -34,7 +34,7 @@ # of Ceilometer (see within for additional settings): # # CEILOMETER_PIPELINE_INTERVAL: Seconds between pipeline processing runs. Default 600. -# CEILOMETER_BACKEND: Database backend (e.g. 'mysql', 'mongodb', 'es', 'gnocchi', 'none') +# CEILOMETER_BACKEND: Database backend (e.g. 'mysql', 'mongodb', 'gnocchi', 'none') # CEILOMETER_COORDINATION_URL: URL for group membership service provided by tooz. # CEILOMETER_EVENT_ALARM: Set to True to enable publisher for event alarming @@ -138,11 +138,6 @@ function _ceilometer_prepare_storage_backend { pip_install_gr pymongo _ceilometer_install_mongodb fi - - if [ "$CEILOMETER_BACKEND" = 'es' ] ; then - ${TOP_DIR}/pkg/elasticsearch.sh download - ${TOP_DIR}/pkg/elasticsearch.sh install - fi } @@ -205,8 +200,6 @@ function _ceilometer_drop_database { if is_service_enabled ceilometer-collector ceilometer-api ; then if [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then mongo ceilometer --eval "db.dropDatabase();" - elif [ "$CEILOMETER_BACKEND" = 'es' ] ; then - curl -XDELETE "localhost:9200/events_*" fi fi } @@ -245,16 +238,9 @@ function _ceilometer_configure_storage_backend { fi elif [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then iniset $CEILOMETER_CONF DEFAULT meter_dispatchers database - iniset $CEILOMETER_CONF database event_connection $(database_connection_url ceilometer) - iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer) - elif [ "$CEILOMETER_BACKEND" = 'es' ] ; then - # es is only supported for events. we will use sql for metering. - iniset $CEILOMETER_CONF database event_connection es://localhost:9200 iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer) - ${TOP_DIR}/pkg/elasticsearch.sh start elif [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then iniset $CEILOMETER_CONF DEFAULT meter_dispatchers database - iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then iniset $CEILOMETER_CONF DEFAULT meter_dispatchers gnocchi @@ -371,7 +357,7 @@ function init_ceilometer { if is_service_enabled gnocchi ; then if [ "$CEILOMETER_BACKEND" = 'gnocchi' ]; then set -e - $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-metering-database --skip-event-database + $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-metering-database set +e fi fi |