wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ec2_vpc_igw - Rename IGWException to AnsibleIGWException.

Browse source
This commit is contained in:
Robert Estelle 2014-12-01 16:02:09 -05:00 committed by Matt Clay
parent 83d3ff2692
commit b180b97273
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/extras/cloud/amazon/ec2_vpc_igw.py
View file

@ -96,7 +96,7 @@ except ImportError:
raise raise
class IGWExcepton(Exception): class AnsibleIGWException(Exception):
pass pass
@ -115,8 +115,8 @@ def ensure_igw_absent(vpc_conn, vpc_id, check_mode):
vpc_conn.detach_internet_gateway(igw.id, vpc_id) vpc_conn.detach_internet_gateway(igw.id, vpc_id)
vpc_conn.delete_internet_gateway(igw.id) vpc_conn.delete_internet_gateway(igw.id)
except EC2ResponseError as e: except EC2ResponseError as e:
raise IGWExcepton('Unable to delete Internet Gateway, error: {0}' raise AnsibleIGWException(
.format(e)) 'Unable to delete Internet Gateway, error: {0}'.format(e))
return {'changed': True} return {'changed': True}
@ -126,7 +126,7 @@ def ensure_igw_present(vpc_conn, vpc_id, check_mode):
filters={'attachment.vpc-id': vpc_id}) filters={'attachment.vpc-id': vpc_id})
if len(igws) > 1: if len(igws) > 1:
raise IGWExcepton( raise AnsibleIGWException(
'EC2 returned more than one Internet Gateway for VPC {0}, aborting' 'EC2 returned more than one Internet Gateway for VPC {0}, aborting'
.format(vpc_id)) .format(vpc_id))
@ -141,8 +141,8 @@ def ensure_igw_present(vpc_conn, vpc_id, check_mode):
vpc_conn.attach_internet_gateway(igw.id, vpc_id) vpc_conn.attach_internet_gateway(igw.id, vpc_id)
return {'changed': True, 'gateway_id': igw.id} return {'changed': True, 'gateway_id': igw.id}
except EC2ResponseError as e: except EC2ResponseError as e:
raise IGWExcepton('Unable to create Internet Gateway, error: {0}' raise AnsibleIGWException(
.format(e)) 'Unable to create Internet Gateway, error: {0}'.format(e))
def main(): def main():
@ -181,7 +181,7 @@ def main():
elif state == 'absent': elif state == 'absent':
result = ensure_igw_absent(vpc_conn, vpc_id, result = ensure_igw_absent(vpc_conn, vpc_id,
check_mode=module.check_mode) check_mode=module.check_mode)
except IGWExcepton as e: except AnsibleIGWException as e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
module.exit_json(**result) module.exit_json(**result)