cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6985 from jimi-c/issue_6763_ec2_vpc_params

Browse source 
Ensure params were set in ec2_vpc before accessing them
This commit is contained in:
James Cammarata 2014-04-23 10:08:50 -05:00
commit 24cfcd1f88
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/cloud/ec2_vpc
View file

@ -328,7 +328,7 @@ def create_vpc(module, vpc_conn):
# Process all subnet properties
if not isinstance(subnets, list):
if subnets and not isinstance(subnets, list):
module.fail_json(msg='subnets needs to be a list of cidr blocks')
current_subnets = vpc_conn.get_all_subnets(filters={ 'vpc_id': vpc.id })
@ -405,7 +405,7 @@ def create_vpc(module, vpc_conn):
# think of without using painful aws ids. Hopefully boto will add
# the replace-route-table API to make this smoother and
# allow control of the 'main' routing table.
if not isinstance(route_tables, list):
if route_tables and not isinstance(route_tables, list):
module.fail_json(msg='route tables need to be a list of dictionaries')
# Work through each route table and update/create to match dictionary array