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

Merge pull request #827 from bcoca/ec2_ami_handle_exceptions

Browse source 
now captures connection exceptions and returns in 'nicer' module failure
This commit is contained in:
Brian Coca 2015-02-25 10:37:43 -05:00
commit ec755796c0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cloud/amazon/ec2_ami.py
View file

@ -242,7 +242,10 @@ def main():
) )
module = AnsibleModule(argument_spec=argument_spec) module = AnsibleModule(argument_spec=argument_spec)
ec2 = ec2_connect(module) try:
ec2 = ec2_connect(module)
except Exception, e:
module.json_fail(msg="Error while connecting to aws: %s" % str(e))
if module.params.get('state') == 'absent': if module.params.get('state') == 'absent':
if not module.params.get('image_id'): if not module.params.get('image_id'):