summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2019-04-18 15:47:57 +0800
committerzhurong <aaronzhu1121@gmail.com>2019-04-26 02:43:20 +0000
commitac190d5087e17231cb388882e68029e17327deca (patch)
treed006dc29743b8c160f9c32db1a35e8cb97265df9
parent9985143ff18dd248309069c5d644e8478dcae960 (diff)
downloadceilometer-ac190d5087e17231cb388882e68029e17327deca.tar.gz
Remove _ceilometer_check_for_storage check
We can check from the history[0], actually it doesn't matter if gnocchi or panko is started first., so this check is unnecessary. Also when i want to migration using native zuulv3, the enabled plugins is in the alphabetical order, so this will caused can not install devstack correctly. [0]: https://review.opendev.org/#/c/387620 [1]: http://logs.openstack.org/99/651999/3/check/telemetry-integration-test/9066108/controller/logs/devstacklog.txt.gz#_2019-04-17_07_26_30_988 Change-Id: I5cbd93739f75b8141f8b79ae03bb8b99756b2a38 (cherry picked from commit 27eb3f431e177054789ef47859517d10862bc902)
-rw-r--r--devstack/settings18
1 files changed, 0 insertions, 18 deletions
diff --git a/devstack/settings b/devstack/settings
index c4fed7db..8c44be47 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -51,24 +51,6 @@ CEILOMETER_EVENT_ALARM=${CEILOMETER_EVENT_ALARM:-False}
# Set up default directories for middleware
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: