diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2017-03-01 15:39:33 +0100 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2017-03-04 10:02:12 +0100 |
| commit | 7905ff3a30ea581b9779611fc62a31bdc9bc70f3 (patch) | |
| tree | be5aacda950d11809983041d74cc68780ec3aaf2 /devstack | |
| parent | d6506b61cf287c92808ffa9a136df06058d06b49 (diff) | |
| download | ceilometer-7905ff3a30ea581b9779611fc62a31bdc9bc70f3.tar.gz | |
Don't run ceilometer-upgrade on unconfigured db
When the database backend is unconfigured, we currently
try to connection to nothing, and due to the retry logic around
the database connection, the user experience is "ceilometer-upgrade is
stuck".
This change keeps the database upgrade is the database is not
configured. And don't use the connection retry logic for upgrade.
Change-Id: I3fa2a332ecac6cb52c145f437f79b2aba43a4757
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 6814be98..19a7a1a0 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -232,6 +232,9 @@ function _ceilometer_configure_cache_backend { # Set configuration for storage backend. function _ceilometer_configure_storage_backend { + + inidelete $CEILOMETER_CONF database metering_connection + if [ "$CEILOMETER_BACKEND" = 'none' ] ; then # It's ok for the backend to be 'none', if panko is enabled. We do not # combine this condition with the outer if statement, so that the else |