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

Merge pull request #1740 from bcoca/ec2_key_check_fix

Browse source 
attempt to fix check mode when state='absent'
This commit is contained in:
Brian Coca 2015-07-18 23:13:03 -04:00
commit 5fcc0be25b
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/amazon/ec2_key.py
View file

@ -127,6 +127,7 @@ def main():
if state == 'absent': if state == 'absent':
if key: if key:
'''found a match, delete it''' '''found a match, delete it'''
if not module.check_mode:
try: try:
key.delete() key.delete()
if wait: if wait:
@ -141,11 +142,8 @@ def main():
module.fail_json(msg="timed out while waiting for the key to be removed") module.fail_json(msg="timed out while waiting for the key to be removed")
except Exception, e: except Exception, e:
module.fail_json(msg="Unable to delete key pair '%s' - %s" % (key, e)) module.fail_json(msg="Unable to delete key pair '%s' - %s" % (key, e))
else:
key = None key = None
changed = True changed = True
else:
'''no match found, no changes required'''
# Ensure requested key is present # Ensure requested key is present
elif state == 'present': elif state == 'present':