Merge pull request #6104 from gianlucaborello/digitalocean_fix_deletion

Make sure droplet deletion works even when idempotency is achieved using 'name' and 'unique_name' rather than 'id'
This commit is contained in:
Michael DeHaan 2014-03-11 10:20:43 -05:00
commit b56f49c1d3

View file

@ -348,7 +348,7 @@ def core(module):
elif state in ('absent', 'deleted'): elif state in ('absent', 'deleted'):
# First, try to find a droplet by id. # First, try to find a droplet by id.
droplet = Droplet.find(id=getkeyordie('id')) droplet = Droplet.find(module.params['id'])
# If we couldn't find the droplet and the user is allowing unique # If we couldn't find the droplet and the user is allowing unique
# hostnames, then check to see if a droplet with the specified # hostnames, then check to see if a droplet with the specified