From 34731eed8bd6ec4cde40465aab7d12d35e63c83b Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Wed, 14 Dec 2016 09:59:41 +0800 Subject: [PATCH] Make sure gnocchi is enabled before ceilometer Ceilometer upgrade will contact gnocchi so we must make sure gnocchi is enabled before ceilometer in devstack. Change-Id: I876b6b7551b00991685c3f9dee7610668b8a8864 Closes-Bug: #1649259 --- devstack/settings | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/devstack/settings b/devstack/settings index 0d3d9ee6e6..09363f4642 100644 --- a/devstack/settings +++ b/devstack/settings @@ -49,6 +49,24 @@ GITBRANCH["python-ceilometerclient"]=${CEILOMETERCLIENT_BRANCH:-master} GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware +# Make sure gnocchi is enabled before ceilometer +function _ceilometer_check_for_gnocchi { + if [ "$CEILOMETER_BACKEND" == 'gnocchi' ]; then + local plugins="${DEVSTACK_PLUGINS}" + local plugin + local seen_gnocchi=False + + for plugin in ${plugins//,/ }; do + if [ "$plugin" == 'gnocchi' ]; then + seen_gnocchi=True + elif [ "$plugin" == 'ceilometer' ]; then + [[ "$seen_gnocchi" == 'False' ]] && die $LINENO "gnocchi must be enabled before ceilometer!" + fi + done + fi +} + +_ceilometer_check_for_gnocchi # Get rid of this before done. # Tell emacs to use shell-script-mode ## Local variables: