summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-05-26 10:53:48 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-05-26 10:53:48 -0700
commit788893ef2a17a4fda5e907f048a94f3ed0435bbc (patch)
tree4cb601bdbe0b7a39e3281f6f0787b14a9927d599
parent30b6d5e2722d1c92115f668b405dc7eed9cc27b2 (diff)
downloadnova-788893ef2a17a4fda5e907f048a94f3ed0435bbc.tar.gz
nova-788893ef2a17a4fda5e907f048a94f3ed0435bbc.tar.xz
nova-788893ef2a17a4fda5e907f048a94f3ed0435bbc.zip
missed a driver reference
-rw-r--r--nova/compute/api.py2
-rw-r--r--nova/scheduler/host_filter.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 216550e40..0b2c4e642 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -264,7 +264,7 @@ class API(base.Base):
"instance_id": instance_id,
"request_spec": {
'instance_type': instance_type,
- 'filter_driver':
+ 'filter':
'nova.scheduler.host_filter.'
'InstanceTypeFilter'
},
diff --git a/nova/scheduler/host_filter.py b/nova/scheduler/host_filter.py
index d9771754a..ed76c90bf 100644
--- a/nova/scheduler/host_filter.py
+++ b/nova/scheduler/host_filter.py
@@ -296,13 +296,13 @@ class HostFilterScheduler(zone_aware_scheduler.ZoneAwareScheduler):
hosts for weighing. The particular filter used may be passed in
as an argument or the default will be used.
- request_spec = {'filter_name': <Filter name>,
+ request_spec = {'filter': <Filter name>,
'instance_type': <InstanceType dict>}
"""
def filter_hosts(self, num, request_spec):
"""Filter the full host list (from the ZoneManager)"""
- filter_name = request_spec.get('filter_name', None)
+ filter_name = request_spec.get('filter', None)
host_filter = choose_host_filter(filter_name)
# TODO(sandy): We're only using InstanceType-based specs