openstack
/
blazar
Code Issues Proposed changes

Merge "Use filter_scheduler config keys"

This commit is contained in:
Jenkins 2017-01-25 16:14:20 +00:00 committed by Gerrit Code Review
parent 5111ffb5c2 5c9fd94c00
commit 09b54f4e66
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 iniset_rpc_backend blazar $BLAZAR_CONF_FILE DEFAULT
iniupdate_rpc_backend $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 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 else
iniset $NOVA_CONF DEFAULT scheduler_default_filters "$ACTUAL_FILTERS,ClimateFilter" iniset $NOVA_CONF filter_scheduler enabled_filters "$ACTUAL_FILTERS,ClimateFilter"
fi 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 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 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"
# Database # Database
recreate_database blazar utf8 recreate_database blazar utf8