diff options
| author | gordon chung <gord@live.ca> | 2016-01-20 14:21:09 -0500 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2016-01-20 22:02:06 -0500 |
| commit | 278c4846efd218c648b76510aba2b52c762866ff (patch) | |
| tree | 9b8eec5da77973aede34e20009642c7b0e5d83a6 | |
| parent | 0a7075b74ee23fb43085e27dea279c522b753784 (diff) | |
| download | ceilometer-278c4846efd218c648b76510aba2b52c762866ff.tar.gz | |
fix unknown gnocchi db in liberty gate
we set gnocchi as CEILOMETER_BACKEND now but ceilometer in liberty
does not know of this setting.
Change-Id: I51d5eeb4ac3977e56f5410ea8713bc655e2e7efa
| -rw-r--r-- | devstack/plugin.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 2ffdeff2..bbd08167 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -227,6 +227,12 @@ function _ceilometer_configure_storage_backend { iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer cleanup_ceilometer + elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then + if is_service_enabled gnocchi-api; then + echo "Let Gnocchi plugin configure backend for Liberty." + else + die $LINENO "Gnocchi service not detected." + fi else die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND" fi @@ -372,7 +378,7 @@ function start_ceilometer { fi # Only die on API if it was actually intended to be turned on - if is_service_enabled ceilometer-api; then + if is_service_enabled ceilometer-api && [ "$CEILOMETER_BACKEND" != 'gnocchi' ] ; then echo "Waiting for ceilometer-api to start..." if ! wait_for_service $SERVICE_TIMEOUT $(ceilometer_service_url)/v2/; then die $LINENO "ceilometer-api did not start" |