cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[digital_ocean] Don't die when the id parameter is missing

Browse source 
It's okay for this to happen now, because we might move on to the name parameter
if unique_name is enabled.
This commit is contained in:
Michael Gregson 2013-09-30 19:22:07 -06:00
parent e1ff809d1a
commit 631105e8b0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cloud/digital_ocean
View file

@ -328,13 +328,15 @@ 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 = None
if 'id' in module.params:
droplet = Droplet.find(id=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
# hostname already exists. # hostname already exists.
if not droplet and module.params['unique_name']: if not droplet and module.params['unique_name'] and 'name' in module.params:
droplet = Droplet.find(name=getkeyordie('name')) droplet = Droplet.find(name=module.params['name'])
if not droplet: if not droplet:
module.exit_json(changed=False, msg='The droplet is not found.') module.exit_json(changed=False, msg='The droplet is not found.')