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

Fix amazon extras modules to compile under python3

Browse source
This commit is contained in:
Toshio Kuratomi 2016-10-23 13:41:03 -07:00 • committed by Matt Clay
commit 3901fe72d3
31 changed files with 192 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/extras/cloud/amazon/ec2_vol_facts.py
View file

@ -66,6 +66,10 @@ try:
except ImportError:
HAS_BOTO = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import connect_to_aws, ec2_argument_spec, get_aws_connection_info
def get_volume_info(volume):
attachment = volume.attach_data
@ -125,15 +129,13 @@ def main():
if region:
try:
connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
except (boto.exception.NoAuthHandlerFound, StandardError), e:
except (boto.exception.NoAuthHandlerFound, StandardError) as e:
module.fail_json(msg=str(e))
else:
module.fail_json(msg="region must be specified")
list_ec2_volumes(connection, module)
from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import *
if __name__ == '__main__':
main()