openstack/watcher
Code Issues Proposed changes

Merge "Fix building of model with a scoped exclusion rule"

Browse Source
This commit is contained in:
Jenkins 2017-01-25 11:59:41 +00:00 committed by Gerrit Code Review
commit 840d422b01
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/scope/default.py
View File

@ -191,6 +191,7 @@ class DefaultScope(base.BaseScope):
allowed_nodes = [] allowed_nodes = []
nodes_to_exclude = [] nodes_to_exclude = []
nodes_to_remove = set()
instances_to_exclude = [] instances_to_exclude = []
model_hosts = list(cluster_model.get_all_compute_nodes().keys()) model_hosts = list(cluster_model.get_all_compute_nodes().keys())
@ -210,7 +211,8 @@ class DefaultScope(base.BaseScope):
nodes=nodes_to_exclude) nodes=nodes_to_exclude)
instances_to_remove = set(instances_to_exclude) instances_to_remove = set(instances_to_exclude)
nodes_to_remove = set(model_hosts) - set(allowed_nodes) if allowed_nodes:
nodes_to_remove = set(model_hosts) - set(allowed_nodes)
nodes_to_remove.update(nodes_to_exclude) nodes_to_remove.update(nodes_to_exclude)
self._remove_node_from_model(nodes_to_remove, cluster_model) self._remove_node_from_model(nodes_to_remove, cluster_model)