openstack/ceilometer
Code Issues Proposed changes

Merge "devstack: check for ceilometer+panko service"

Browse Source
This commit is contained in:
Jenkins
2017-01-04 18:44:38 +00:00
committed by Gerrit Code Review
parent 27df3d3d07 322ccb0f43
commit 75539b2725
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
devstack/settings
View File

@@ -50,11 +50,12 @@ GITBRANCH["python-ceilometerclient"]=${CEILOMETERCLIENT_BRANCH:-master}
GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient
GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware
# Make sure gnocchi is enabled before ceilometer # Make sure gnocchi and panko plugin is enabled before ceilometer
function _ceilometer_check_for_gnocchi { function _ceilometer_check_for_storage {
local plugins="${DEVSTACK_PLUGINS}"
local plugin
if [ "$CEILOMETER_BACKEND" == 'gnocchi' ]; then if [ "$CEILOMETER_BACKEND" == 'gnocchi' ]; then
local plugins="${DEVSTACK_PLUGINS}"
local plugin
local seen_gnocchi=False local seen_gnocchi=False
for plugin in ${plugins//,/ }; do for plugin in ${plugins//,/ }; do
@@ -65,9 +66,20 @@ function _ceilometer_check_for_gnocchi {
fi fi
done done
fi fi
local seen_ceilometer=False
for plugin in ${plugins//,/ }; do
if [ "$plugin" == 'ceilometer' ]; then
seen_ceilometer=True
elif [ "$plugin" == 'panko' ] && [[ "$seen_ceilometer" == 'True' ]]; then
die $LINENO "Panko must be enabled before ceilometer!"
fi
done
} }
_ceilometer_check_for_gnocchi _ceilometer_check_for_storage
# Get rid of this before done. # Get rid of this before done.
# Tell emacs to use shell-script-mode # Tell emacs to use shell-script-mode
## Local variables: ## Local variables: