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

Getting rid of a None type error when no resource tags are defined. (#4638)

Browse source
This commit is contained in:
Kenny Woodson 2016-09-02 14:54:27 -04:00 committed by Toshio Kuratomi
parent 42c74a0ce2
commit 9b37dcb593
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/amazon/ec2_vpc.py
View file

@ -408,7 +408,7 @@ def create_vpc(module, vpc_conn):
for subnet in subnets: for subnet in subnets:
add_subnet = True add_subnet = True
subnet_tags_current = True subnet_tags_current = True
new_subnet_tags = subnet.get('resource_tags', None) new_subnet_tags = subnet.get('resource_tags', {})
subnet_tags_delete = [] subnet_tags_delete = []
for csn in current_subnets: for csn in current_subnets:
@ -444,7 +444,7 @@ def create_vpc(module, vpc_conn):
if add_subnet: if add_subnet:
try: try:
new_subnet = vpc_conn.create_subnet(vpc.id, subnet['cidr'], subnet.get('az', None)) new_subnet = vpc_conn.create_subnet(vpc.id, subnet['cidr'], subnet.get('az', None))
new_subnet_tags = subnet.get('resource_tags', None) new_subnet_tags = subnet.get('resource_tags', {})
if new_subnet_tags: if new_subnet_tags:
# Sometimes AWS takes its time to create a subnet and so using new subnets's id # Sometimes AWS takes its time to create a subnet and so using new subnets's id
# to create tags results in exception. # to create tags results in exception.