summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-04-29 04:34:43 +0000
committerGerrit Code Review <review@openstack.org>2019-04-29 04:34:43 +0000
commitba933aab668f28b1767112d2e02ce2ed786a4837 (patch)
tree700e5b8ed711b724b81612619c42eff51f294ae8
parentc3ca14debc1b2487b7ea4ca91a6f1ee3f61cd942 (diff)
parent85b44a3264a0ae6553059e55a54d6a009e614222 (diff)
downloadceilometer-ba933aab668f28b1767112d2e02ce2ed786a4837.tar.gz
Merge "Remove _ceilometer_check_for_storage check" into stable/queens
-rw-r--r--devstack/settings18
1 files changed, 0 insertions, 18 deletions
diff --git a/devstack/settings b/devstack/settings
index 16ccb8cf..f1689119 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -57,24 +57,6 @@ GITBRANCH["python-ceilometerclient"]=${CEILOMETERCLIENT_BRANCH:-master}
GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient
GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware
-# Make sure panko plugin is enabled before ceilometer
-function _ceilometer_check_for_storage {
- local plugins="${DEVSTACK_PLUGINS}"
- local plugin
-
- 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_storage
-
# Get rid of this before done.
# Tell emacs to use shell-script-mode
## Local variables: