openstack/ceilometer
Code Issues Proposed changes

devstack: fix gnocchi database setup

Browse Source 
With postgresql, we must wait at least post-config to
create the database.

Change-Id: I72ce33828febb48136e239d0e70f07674aef9d4a
This commit is contained in:
Mehdi Abaakouk
2018-01-16 09:15:39 +01:00
committed by Mehdi Abaakouk
parent f08653117f
commit 26d26d6776
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@@ -165,6 +165,11 @@ function install_gnocchi {
else else
pip_install gnocchi[redis,${DATABASE_TYPE},keystone] uwsgi pip_install gnocchi[redis,${DATABASE_TYPE},keystone] uwsgi
fi fi
}
function configure_gnocchi {
echo_summary "Configure Gnocchi"
recreate_database gnocchi recreate_database gnocchi
sudo install -d -o $STACK_USER -m 755 $GNOCCHI_CONF_DIR sudo install -d -o $STACK_USER -m 755 $GNOCCHI_CONF_DIR
@@ -232,6 +237,7 @@ function _ceilometer_configure_storage_backend {
fi fi
elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=gnocchi_swift/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=gnocchi_swift/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml
! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && configure_gnocchi
else else
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND" die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
fi fi