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

Make sure subnets and route_tables are initialized before using

Browse source 
Fixes #7712
This commit is contained in:
James Cammarata 2014-07-02 09:26:14 -05:00
parent 8e6a60dfd6
commit 2b1af586a2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cloud/ec2_vpc
View file

@ -274,6 +274,11 @@ def create_vpc(module, vpc_conn):
wait_timeout = int(module.params.get('wait_timeout')) wait_timeout = int(module.params.get('wait_timeout'))
changed = False changed = False
if subnets is None:
subnets = []
if route_tables is None:
route_tables = []
# Check for existing VPC by cidr_block + tags or id # Check for existing VPC by cidr_block + tags or id
previous_vpc = find_vpc(module, vpc_conn, id, cidr_block) previous_vpc = find_vpc(module, vpc_conn, id, cidr_block)
@ -408,7 +413,7 @@ def create_vpc(module, vpc_conn):
if route_tables and 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') 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 # Work through each route table and update/create to match dictionary array
all_route_tables = [] all_route_tables = []
for rt in route_tables: for rt in route_tables:
try: try:
@ -561,11 +566,11 @@ def main():
wait_timeout = dict(default=300), wait_timeout = dict(default=300),
dns_support = dict(type='bool', default=True), dns_support = dict(type='bool', default=True),
dns_hostnames = dict(type='bool', default=True), dns_hostnames = dict(type='bool', default=True),
subnets = dict(type='list'), subnets = dict(type='list', default=[]),
vpc_id = dict(), vpc_id = dict(),
internet_gateway = dict(type='bool', default=False), internet_gateway = dict(type='bool', default=False),
resource_tags = dict(type='dict'), resource_tags = dict(type='dict'),
route_tables = dict(type='list'), route_tables = dict(type='list', default=[]),
state = dict(choices=['present', 'absent'], default='present'), state = dict(choices=['present', 'absent'], default='present'),
) )
) )