openstack/devstack-gate
Code Issues Proposed changes

Merge "Don't trust the delete API."

Browse Source
This commit is contained in:
Jenkins
2012-08-03 17:42:50 +00:00
committed by Gerrit Code Review
parent 72695310c1 194e025283
commit cf8cbed2f2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack-vm-reap.py
View File

@@ -59,6 +59,11 @@ def delete_machine(jenkins, client, machine):
if server:
utils.delete_server(server)
# Rackspace Nova sometimes lies about whether a server is deleted.
# If we have deleted a server, don't believe it. Instead, wait for
# the next run of the script and only if the server doesn't exist,
# delete it from Jenkins and the DB.
return
if jenkins:
if machine.jenkins_name:
@@ -77,6 +82,11 @@ def delete_image(client, image):
if server:
utils.delete_server(server)
# Rackspace Nova sometimes lies about whether a server is deleted.
# If we have deleted a server, don't believe it. Instead, wait for
# the next run of the script and only if the server doesn't exist,
# delete it from Jenkins and the DB.
return
try:
remote_image = client.images.get(image.external_id)