internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 46a1f73778
commit 3901fe72d3
31 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/modules/extras/cloud/amazon/ec2_remote_facts.py
View File

@@ -65,6 +65,10 @@ try:
except ImportError:
HAS_BOTO = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import AnsibleAWSError, connect_to_aws, ec2_argument_spec, get_aws_connection_info
def get_instance_info(instance):
# Get groups
@@ -171,16 +175,13 @@ def main():
if region:
try:
connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
except (boto.exception.NoAuthHandlerFound, AnsibleAWSError), e:
except (boto.exception.NoAuthHandlerFound, AnsibleAWSError) as e:
module.fail_json(msg=str(e))
else:
module.fail_json(msg="region must be specified")
list_ec2_instances(connection, module)
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import *
if __name__ == '__main__':
main()