From 9b37dcb5934f425988826237361bed6c70470784 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 2 Sep 2016 14:54:27 -0400
Subject: [PATCH] Getting rid of a None type error when no resource tags are
 defined. (#4638)

---
 cloud/amazon/ec2_vpc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud/amazon/ec2_vpc.py b/cloud/amazon/ec2_vpc.py
index 85efff50eb7..3df47c57b15 100644
--- a/cloud/amazon/ec2_vpc.py
+++ b/cloud/amazon/ec2_vpc.py
@@ -408,7 +408,7 @@ def create_vpc(module, vpc_conn):
         for subnet in subnets:
             add_subnet = True
             subnet_tags_current = True
-            new_subnet_tags = subnet.get('resource_tags', None)
+            new_subnet_tags = subnet.get('resource_tags', {})
             subnet_tags_delete = []
 
             for csn in current_subnets:
@@ -444,7 +444,7 @@ def create_vpc(module, vpc_conn):
             if add_subnet:
                 try:
                     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:
                         # Sometimes AWS takes its time to create a subnet and so using new subnets's id
                         # to create tags results in exception.