ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Don't raise or catch StandardError in amazon modules

Browse source
This commit is contained in:
Toshio Kuratomi 2015-11-30 19:01:57 -08:00 • committed by Matt Clay
commit 5bd1bcaa2d
15 changed files with 164 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/extras/cloud/amazon/ec2_elb_facts.py
View file

@ -182,7 +182,7 @@ def main():
if region:
try:
connection = connect_to_aws(boto.ec2.elb, region, **aws_connect_params)
except (boto.exception.NoAuthHandlerFound, StandardError), e:
except (boto.exception.NoAuthHandlerFound, AnsibleAWSError), e:
module.fail_json(msg=str(e))
else:
module.fail_json(msg="region must be specified")
@ -192,4 +192,5 @@ def main():
from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import *
main()
if __name__ == '__main__':
main()