Merge "Dont use unassigned roles during deploy"

This commit is contained in:
Jenkins 2016-08-29 08:11:24 +00:00 committed by Gerrit Code Review
commit d844412b82

View File

@ -307,9 +307,12 @@ def _make_topology(nodes, roles):
roles_to_node[role].extend(matched_nodes)
service_to_node = {}
for role in roles.keys():
for svc in roles[role]:
service_to_node.setdefault(svc, [])
service_to_node[svc].extend(roles_to_node[role])
if role in roles_to_node:
for svc in roles[role]:
service_to_node.setdefault(svc, [])
service_to_node[svc].extend(roles_to_node[role])
else:
LOG.warning("Role '%s' defined, but unused", role)
return service_to_node