There should probably be a little more validation, but this should work:
=== modified file 'nova/scheduler/base_scheduler.py' --- nova/scheduler/base_scheduler.py 2011-08-22 18:07:59 +0000 +++ nova/scheduler/base_scheduler.py 2011-09-02 18:34:10 +0000 @@ -36,7 +36,9 @@ """ def filter_hosts(self, topic, request_spec, hosts=None): """Filter the full host list (from the ZoneManager)""" - filters = request_spec.get('filter', FLAGS.default_host_filters) + filters = request_spec.get('filter', None) + if not filters: + filters = FLAGS.default_host_filters if not isinstance(filters, (list, tuple)): filters = [filters] if hosts is None:
« Back to merge proposal
There should probably be a little more validation, but this should work:
=== modified file 'nova/scheduler /base_scheduler .py' base_scheduler. py 2011-08-22 18:07:59 +0000 base_scheduler. py 2011-09-02 18:34:10 +0000 spec.get( 'filter' , FLAGS.default_ host_filters) spec.get( 'filter' , None) host_filters
filters = [filters]
--- nova/scheduler/
+++ nova/scheduler/
@@ -36,7 +36,9 @@
"""
def filter_hosts(self, topic, request_spec, hosts=None):
"""Filter the full host list (from the ZoneManager)"""
- filters = request_
+ filters = request_
+ if not filters:
+ filters = FLAGS.default_
if not isinstance(filters, (list, tuple)):
if hosts is None: