Merge "Remove wrong check from conductor periodic task"

This commit is contained in:
Jenkins 2016-10-13 08:33:07 +00:00 committed by Gerrit Code Review
commit edb3bcff43

View File

@ -1205,8 +1205,6 @@ class ConductorManager(base_manager.BaseConductorManager):
filters={'provision_state': states.DEPLOYING,
'maintenance': False,
'reserved_by_any_of': offline_conductors})
if not node_iter:
return
for node_uuid, driver, node_id, conductor_hostname in node_iter:
# NOTE(lucasagomes): Although very rare, this may lead to a