x/python-ganttclient
Code Issues Proposed changes

Removes the incorrect hard-coded filter path.

Browse Source
This commit is contained in:
Ed Leafe
2011-08-19 18:37:39 +00:00
committed by Tarmac
parent 6e0ad77a08 0ad1307fb0
commit e91efd232f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/scheduler/abstract_scheduler.py
View File

@@ -62,12 +62,13 @@ class AbstractScheduler(driver.Scheduler):
host = build_plan_item['hostname'] host = build_plan_item['hostname']
base_options = request_spec['instance_properties'] base_options = request_spec['instance_properties']
image = request_spec['image'] image = request_spec['image']
instance_type = request_spec.get('instance_type')
# TODO(sandy): I guess someone needs to add block_device_mapping # TODO(sandy): I guess someone needs to add block_device_mapping
# support at some point? Also, OS API has no concept of security # support at some point? Also, OS API has no concept of security
# groups. # groups.
instance = compute_api.API().create_db_entry_for_new_instance(context, instance = compute_api.API().create_db_entry_for_new_instance(context,
image, base_options, None, []) instance_type, image, base_options, None, [])
instance_id = instance['id'] instance_id = instance['id']
kwargs['instance_id'] = instance_id kwargs['instance_id'] = instance_id

4
nova/scheduler/host_filter.py
View File

@@ -58,8 +58,6 @@ def choose_host_filter(filter_name=None):
if not filter_name: if not filter_name:
filter_name = FLAGS.default_host_filter filter_name = FLAGS.default_host_filter
for filter_class in _get_filters(): for filter_class in _get_filters():
host_match = "%s.%s" % (filter_class.__module__, filter_class.__name__) if filter_class.__name__ == filter_name:
if (host_match.startswith("nova.scheduler.filters") and
(host_match.split(".")[-1] == filter_name)):
return filter_class() return filter_class()
raise exception.SchedulerHostFilterNotFound(filter_name=filter_name) raise exception.SchedulerHostFilterNotFound(filter_name=filter_name)