openstack
/
blazar
Code Issues Proposed changes

Use filter_scheduler config keys 

scheduler_available_filters and scheduler_default_filters are deprecated
in Nova. Current config keys are available_filters and enabled_filters
under the filter_scheduler group.

Change-Id: Id53a2dc0dbbd90068b10d89873bba03ef4008155
This commit is contained in:
Masahito Muroi 2017-01-25 12:14:32 +09:00 committed by Pierre Riteau
parent 0ff134d458
commit 5c9fd94c00
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@ -76,18 +76,18 @@ function configure_blazar {
iniset_rpc_backend blazar $BLAZAR_CONF_FILE DEFAULT
iniupdate_rpc_backend $BLAZAR_CONF_FILE DEFAULT
ACTUAL_FILTERS=$(iniget $NOVA_CONF DEFAULT scheduler_default_filters)
ACTUAL_FILTERS=$(iniget $NOVA_CONF filter_scheduler enabled_filters)
if [[ -z "$ACTUAL_FILTERS" ]]; then
iniadd $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, ClimateFilter"
iniadd $NOVA_CONF filter_scheduler enabled_filters "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, ClimateFilter"
else
iniset $NOVA_CONF DEFAULT scheduler_default_filters "$ACTUAL_FILTERS,ClimateFilter"
iniset $NOVA_CONF filter_scheduler enabled_filters "$ACTUAL_FILTERS,ClimateFilter"
fi
ACTUAL_AVAILABLE_FILTERS=$(iniget $NOVA_CONF DEFAULT scheduler_available_filters)
ACTUAL_AVAILABLE_FILTERS=$(iniget $NOVA_CONF filter_scheduler available_filters)
if [[ -z "$ACTUAL_AVAILABLE_FILTERS" ]]; then
iniset $NOVA_CONF DEFAULT scheduler_available_filters "nova.scheduler.filters.all_filters"
iniset $NOVA_CONF filter_scheduler available_filters "nova.scheduler.filters.all_filters"
fi
iniadd $NOVA_CONF DEFAULT scheduler_available_filters "blazarnova.scheduler.filters.blazar_filter.ClimateFilter"
iniadd $NOVA_CONF filter_scheduler available_filters "blazarnova.scheduler.filters.blazar_filter.ClimateFilter"
ACTUAL_OSAPI_COMPUTE_EXTENSIONS=$(iniget_multiline $NOVA_CONF DEFAULT osapi_compute_extension)
if [[ -z "$ACTUAL_OSAPI_COMPUTE_EXTENSIONS" ]]; then