diff options
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/filters/isolated_hosts_filter.py | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py index c8849bcca..fc9884a55 100644 --- a/nova/scheduler/filters/isolated_hosts_filter.py +++ b/nova/scheduler/filters/isolated_hosts_filter.py @@ -33,9 +33,27 @@ class IsolatedHostsFilter(filters.BaseHostFilter): """Returns host.""" def host_passes(self, host_state, filter_properties): + """ + Result Matrix: + | isolated_image | non_isolated_image + -------------+----------------+------------------- + iso_host | True | False + non_iso_host | False | True + + """ + # If the configuration does not list any hosts, the filter will always + # return True, assuming a configuration error, so letting all hosts + # through. + isolated_hosts = CONF.isolated_hosts + isolated_images = CONF.isolated_images + if not isolated_images: + # As there are no images to match, return False if the host is in + # the isolation list + return host_state.host not in isolated_hosts + spec = filter_properties.get('request_spec', {}) props = spec.get('instance_properties', {}) image_ref = props.get('image_ref') - image_isolated = image_ref in CONF.isolated_images - host_isolated = host_state.host in CONF.isolated_hosts + image_isolated = image_ref in isolated_images + host_isolated = host_state.host in isolated_hosts return image_isolated == host_isolated |