Indented code so it only executes tag comparison for matching cird values

lib/ansible/modules/cloud/amazon/ec2_vpc.py

@@ -413,30 +413,31 @@ def create_vpc(module, vpc_conn):
                 if subnet['cidr'] == csn.cidr_block:
                     add_subnet = False
 
-                # Check if AWS subnet tags are in playbook subnet tags
+                    # Check if AWS subnet tags are in playbook subnet tags
-                subnet_tags_extra = (set(csn.tags.items()).issubset(set(new_subnet_tags.items())))
+                    existing_tags_subset_of_new_tags = (set(csn.tags.items()).issubset(set(new_subnet_tags.items())))
-                # Check if subnet tags in playbook are in AWS subnet tags 
+                    # Check if subnet tags in playbook are in AWS subnet tags
-                subnet_tags_current = (set(new_subnet_tags.items()).issubset(set(csn.tags.items())))
+                    new_tags_subset_of_existing_tags = (set(new_subnet_tags.items()).issubset(set(csn.tags.items())))
-                if subnet_tags_extra is False:
+
-                    try:
+                    if existing_tags_subset_of_new_tags is False:
-                        for item in csn.tags.items():
+                        try:
-                            if item not in new_subnet_tags.items():
+                            for item in csn.tags.items():
-                                subnet_tags_delete.append(item)
+                                if item not in new_subnet_tags.items():
-
+                                    subnet_tags_delete.append(item)
-                        subnet_tags_delete = [key[0] for key in subnet_tags_delete]
+
-                        delete_subnet_tag = vpc_conn.delete_tags(csn.id, subnet_tags_delete)
+                            subnet_tags_delete = [key[0] for key in subnet_tags_delete]
-                        changed = True
+                            delete_subnet_tag = vpc_conn.delete_tags(csn.id, subnet_tags_delete)
-                    except EC2ResponseError, e:
+                            changed = True
-                        module.fail_json(msg='Unable to delete resource tag, error {0}'.format(e))
+                        except EC2ResponseError, e:
-                # Add new subnet tags if not current
+                            module.fail_json(msg='Unable to delete resource tag, error {0}'.format(e))
-                subnet_tags_current = (set(new_subnet_tags.items()).issubset(set(csn.tags.items())))
+                    # Add new subnet tags if not current
-                if subnet_tags_current is not True:
+
-                    try:
+                    if new_tags_subset_of_existing_tags is False:
-                        changed = True
+                        try:
-                        create_subnet_tag = vpc_conn.create_tags(csn.id, new_subnet_tags)
+                            changed = True
-
+                            create_subnet_tag = vpc_conn.create_tags(csn.id, new_subnet_tags)
-                    except EC2ResponseError, e:
+
-                        module.fail_json(msg='Unable to create resource tag, error: {0}'.format(e))
+                        except EC2ResponseError, e:
+                            module.fail_json(msg='Unable to create resource tag, error: {0}'.format(e))
 
             if add_subnet:
                 try: