zuul
/
nodepool
Code Issues Proposed changes

Fix logic error with nodepool-id 

In our case, we won't have zuulv3-dev setting metadata but
nodepool.o.o will.  This now means, nodepool.o.o should not delete
'leaked' nodes because zuulv3-dev.o.o has launched them.

Change-Id: I9a2dbd3845928f83a9cca67082fd6b1ca247a607
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-02-28 13:13:48 -05:00
parent a6f4f6be9b
commit 2216e349c0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodepool/nodepool.py
View File

@ -1543,7 +1543,8 @@ class NodePool(threading.Thread):
meta['provider_name']))
continue
nodepool_id = meta.get('nodepool_id', None)
if nodepool_id and nodepool_id != provider.nodepool_id:
if provider.nodepool_id is not None and \
nodepool_id != provider.nodepool_id:
self.log.debug("Instance %s (%s) in %s "
"was not launched by us" % (
server['name'], server['id'],