ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 04:40: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

10
lib/ansible/modules/extras/cloud/amazon/ec2_eni.py
View file

@ -241,6 +241,12 @@ 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,
get_ec2_security_group_ids_from_names)
def get_eni_info(interface):
# Private addresses
@ -539,7 +545,7 @@ def main():
try:
connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
vpc_connection = connect_to_aws(boto.vpc, 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")
@ -561,8 +567,6 @@ def main():
elif state == 'absent':
delete_eni(connection, module)
from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import *
if __name__ == '__main__':
main()