From 9c063c6a9e7a3163a05b1c36a289075e86cfa2be Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 23 Nov 2011 16:26:33 -0800 Subject: [PATCH] Handle machines that were already deleted. Change-Id: I54fb889f8d34cbe1c65ecd35ea90223b3265e892 --- slave_scripts/devstack-vm-reap.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/slave_scripts/devstack-vm-reap.py b/slave_scripts/devstack-vm-reap.py index 64e3db77..c005d6e5 100755 --- a/slave_scripts/devstack-vm-reap.py +++ b/slave_scripts/devstack-vm-reap.py @@ -40,10 +40,13 @@ if CLOUD_SERVERS_DRIVER == 'rackspace': conn = Driver(CLOUD_SERVERS_USERNAME, CLOUD_SERVERS_API_KEY) def delete(machine): - node = [n for n in conn.list_nodes() if n.id==str(machine['id'])][0] - node_name = machine['name'] + node = [n for n in conn.list_nodes() if n.id==str(machine['id'])] + if not node: + print ' Machine id %s not found' % machine['id'] + db.delMachine(machine['id']) + return + node = node[0] node.destroy() - db.delMachine(machine['id']) now = time.time()