openstack/placement
Code Issues Proposed changes

conf: Group scheduler options

Browse Source 
Move all scheduler options into their one of two groups. Many of the
options are simply renamed to remove their 'scheduler_' prefix, with
some exceptions:

* scheduler_default_filters -> enabled_filters
* scheduler_baremetal_default_filters -> baremetal_enabled_filters
* scheduler_driver_task_period -> periodic_task_interval
* scheduler_tracks_instance_changes -> track_instance_changes

Change-Id: I3f48e52815e80c99612bcd10cb53331a8c995fc3
Co-Authored-By: Stephen Finucane <sfinucan@redhat.com>
Implements: blueprint centralize-config-options-ocata
This commit is contained in:
Alexis Lee 2016-08-02 13:08:54 +01:00 committed by Stephen Finucane
parent fb0ed6dc45
commit 740b90c96c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/scheduler/filters/aggregate_image_properties_isolation.py
View File

@ -36,8 +36,10 @@ class AggregateImagePropertiesIsolation(filters.BaseHostFilter):
"""Checks a host in an aggregate that metadata key/value match """Checks a host in an aggregate that metadata key/value match
with image properties. with image properties.
""" """
cfg_namespace = CONF.aggregate_image_properties_isolation_namespace cfg_namespace = (CONF.filter_scheduler.
cfg_separator = CONF.aggregate_image_properties_isolation_separator aggregate_image_properties_isolation_namespace)
cfg_separator = (CONF.filter_scheduler.
aggregate_image_properties_isolation_separator)
image_props = spec_obj.image.properties if spec_obj.image else {} image_props = spec_obj.image.properties if spec_obj.image else {}
metadata = utils.aggregate_metadata_get_by_host(host_state) metadata = utils.aggregate_metadata_get_by_host(host_state)

6
nova/tests/unit/scheduler/filters/test_aggregate_image_properties_isolation_filters.py
View File

@ -94,8 +94,10 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_isolation_props_namespace(self, def test_aggregate_image_properties_isolation_props_namespace(self,
agg_mock): agg_mock):
self.flags(aggregate_image_properties_isolation_namespace="hw") self.flags(aggregate_image_properties_isolation_namespace='hw',
self.flags(aggregate_image_properties_isolation_separator="_") group='filter_scheduler')
self.flags(aggregate_image_properties_isolation_separator='_',
group='filter_scheduler')
agg_mock.return_value = {'hw_vm_mode': 'hvm', 'img_owner_id': 'foo'} agg_mock.return_value = {'hw_vm_mode': 'hvm', 'img_owner_id': 'foo'}
spec_obj = objects.RequestSpec( spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx, context=mock.sentinel.ctx,