summaryrefslogtreecommitdiffstats
path: root/nova/scheduler
diff options
context:
space:
mode:
authorDina Belova <dbelova@mirantis.com>2012-04-23 16:37:06 +0400
committerDina Belova <dbelova@mirantis.com>2012-04-26 18:07:16 +0400
commite8626ced188dbfc4d33a5d0bd74dfcd4ed18c4f4 (patch)
tree030b152cd4ec31db2508eb35e694f63b035532ad /nova/scheduler
parentcaa1b282c701d5e9b9e02ffdb07d432d9b35ed13 (diff)
Improvement for the correct query extraction.
Change-Id: I6bf318dc42e9bc1cebb94a7d1c561b3e89ae6ec5
Diffstat (limited to 'nova/scheduler')
-rw-r--r--nova/scheduler/filters/json_filter.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py
index 19c80b019..c0aa49b89 100644
--- a/nova/scheduler/filters/json_filter.py
+++ b/nova/scheduler/filters/json_filter.py
@@ -128,7 +128,10 @@ class JsonFilter(filters.BaseHostFilter):
"""Return a list of hosts that can fulfill the requirements
specified in the query.
"""
- query = filter_properties.get('query', None)
+ try:
+ query = filter_properties['scheduler_hints']['query']
+ except KeyError:
+ query = None
if not query:
return True