diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-29 04:26:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-29 04:26:39 +0000 |
| commit | 2008444a234a4378bb574e113deb7185716cdd29 (patch) | |
| tree | 755306a63564e7143d1d16b557d53a3d54419b51 /devstack | |
| parent | d6b10ac2b294f1da9b22a009f68af1577b1cf5a5 (diff) | |
| parent | b1af14d06ac91524ec3a047589325154fc95bae1 (diff) | |
| download | ceilometer-2008444a234a4378bb574e113deb7185716cdd29.tar.gz | |
Merge "remove ceilometer-collector condition when configuring storage"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b2618cb4..614ec5a7 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -197,7 +197,7 @@ function _ceilometer_cleanup_apache_wsgi { } function _ceilometer_drop_database { - if is_service_enabled ceilometer-collector ceilometer-api ; then + if is_service_enabled ceilometer-api ; then if [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then mongo ceilometer --eval "db.dropDatabase();" fi @@ -331,8 +331,11 @@ function configure_ceilometer { configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR # Configure storage - if is_service_enabled ceilometer-collector ceilometer-api; then + if is_service_enabled ceilometer-api; then _ceilometer_configure_storage_backend + fi + + if is_service_enabled ceilometer-collector; then iniset $CEILOMETER_CONF collector workers $API_WORKERS fi @@ -359,7 +362,7 @@ function init_ceilometer { sudo install -d -o $STACK_USER $CEILOMETER_AUTH_CACHE_DIR rm -f $CEILOMETER_AUTH_CACHE_DIR/* - if is_service_enabled ceilometer-collector ceilometer-api; then + if is_service_enabled ceilometer-api; then if is_service_enabled mysql postgresql ; then if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] || [ "$CEILOMETER_BACKEND" = 'es' ] ; then recreate_database ceilometer @@ -382,7 +385,7 @@ function install_ceilometer { _ceilometer_prepare_coordination fi - if is_service_enabled ceilometer-collector ceilometer-api; then + if is_service_enabled ceilometer-api; then _ceilometer_prepare_storage_backend fi |