From 6052583756ab4adc6a5380f8cbb9e27cbcd01d98 Mon Sep 17 00:00:00 2001 From: zhurong Date: Thu, 18 Apr 2019 15:47:57 +0800 Subject: [PATCH] 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 --- devstack/settings | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/devstack/settings b/devstack/settings index 22da068ec2..249dfa4442 100644 --- a/devstack/settings +++ b/devstack/settings @@ -55,24 +55,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: