openstack
/
blazar
Code Issues Proposed changes

Do not change nova scheduler filters after installed climate 

After climate was installed by devstack, it was changing nova default
scheduler filters:
scheduler_available_filters = climatenova.scheduler.filters.climate_filter.ClimateFilter
scheduler_default_filters = ClimateFilter

But the default scheduler filters for nova is the following after
installed by devstack without climate.
scheduler_available_filters = nova.scheduler.filters.all_filters
scheduler_default_filters = RetryFilter, AvailabilityZoneFilter,
RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter,
ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter

So after installed devstack with climate, nova scheduler filters should
be as following:
scheduler_available_filters = climatenova.scheduler.filters.climate_filter.ClimateFilter
scheduler_available_filters = nova.scheduler.filters.all_filters
scheduler_default_filters = RetryFilter, AvailabilityZoneFilter,
RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter,
ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, ClimateFilter

Change-Id: I74272d3282425baeb96a2862b22a26ab0a35a5df
Closes-Bug: #1316417
This commit is contained in:
Jay Lau 2014-05-06 14:02:54 +08:00
parent 430536643e
commit 06e9244e60
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/devstack/lib/climate
View File

@ -113,11 +113,15 @@ function configure_climate() {
ACTUAL_FILTERS=$(iniget $NOVA_CONF DEFAULT scheduler_default_filters)
if [[ -z "$ACTUAL_FILTERS" ]]; then
iniadd $NOVA_CONF DEFAULT scheduler_default_filters "ClimateFilter"
iniadd $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, ClimateFilter"
else
iniset $NOVA_CONF DEFAULT scheduler_default_filters "$ACTUAL_FILTERS,ClimateFilter"
fi
ACTUAL_AVAILABLE_FILTERS=$(iniget $NOVA_CONF DEFAULT scheduler_available_filters)
if [[ -z "$ACTUAL_AVAILABLE_FILTERS" ]]; then
iniset $NOVA_CONF DEFAULT scheduler_available_filters "nova.scheduler.filters.all_filters"
fi
iniadd $NOVA_CONF DEFAULT scheduler_available_filters "climatenova.scheduler.filters.climate_filter.ClimateFilter"
ACTUAL_OSAPI_COMPUTE_EXTENSIONS=$(iniget_multiline $NOVA_CONF DEFAULT osapi_compute_extension)