diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-01 21:26:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-01 21:26:11 +0000 |
| commit | 0eccf068d54c3072a2842ad07360fd1c2e6742a0 (patch) | |
| tree | 1d34519ba9fd36f80cd5ce4b41d723eae0b762f7 /devstack | |
| parent | 39069b1263be3ea359b07b9f552bcc55222199f6 (diff) | |
| parent | 995f93df360fa971a0c93e4cb856c035ff024598 (diff) | |
| download | ceilometer-0eccf068d54c3072a2842ad07360fd1c2e6742a0.tar.gz | |
Merge "devstack: allow to configure not backend"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 10 | ||||
| -rw-r--r-- | devstack/settings | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 889ea869..9cfa9e0b 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') +# CEILOMETER_BACKEND: Database backend (e.g. 'mysql', 'mongodb', 'es', '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 @@ -237,7 +237,13 @@ function _ceilometer_configure_cache_backend { # Set configuration for storage backend. function _ceilometer_configure_storage_backend { - if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then + if [ "$CEILOMETER_BACKEND" = 'none' ] ; then + inidelete $CEILOMETER_CONF DEFAULT meter_dispatchers + inidelete $CEILOMETER_CONF DEFAULT event_dispatchers + if ! is_service_enabled panko-api; then + echo_summary "All Ceilometer backends seems disabled, set \$CEILOMETER_BACKEND to select one." + 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) diff --git a/devstack/settings b/devstack/settings index 441300bb..0d3d9ee6 100644 --- a/devstack/settings +++ b/devstack/settings @@ -15,8 +15,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 database backend -CEILOMETER_BACKEND=${CEILOMETER_BACKEND:-mysql} +# Set up no backend +CEILOMETER_BACKEND=${CEILOMETER_BACKEND:-none} # Gnocchi default archive_policy for Ceilometer GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low} |