From 2216e349c000532a93497767df262eced7603766 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 28 Feb 2017 13:13:48 -0500 Subject: [PATCH] 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 --- nodepool/nodepool.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py index 2ffc6a8f5..4d426ab44 100644 --- a/nodepool/nodepool.py +++ b/nodepool/nodepool.py @@ -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'],