From 187ebf2f5633b23d0b45cd97cf65f01ceee465fc Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 31 Oct 2013 18:45:46 -0400 Subject: [PATCH] Leverage 4318b27 and no longer treat instance tags as JSON, but as dictionary types which could be key=value or dicts or JSON or references. --- library/cloud/ec2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/cloud/ec2 b/library/cloud/ec2 index fc284c14a67..75b3da960cf 100644 --- a/library/cloud/ec2 +++ b/library/cloud/ec2 @@ -476,7 +476,7 @@ def create_instances(module, ec2): if instance_tags: try: - ec2.create_tags(instids, module.from_json(instance_tags)) + ec2.create_tags(instids, instance_tags) except boto.exception.EC2ResponseError as e: module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message)) @@ -577,7 +577,7 @@ def main(): aws_access_key = dict(aliases=['ec2_access_key', 'access_key']), placement_group = dict(), user_data = dict(), - instance_tags = dict(), + instance_tags = dict(type='dict'), vpc_subnet_id = dict(), private_ip = dict(), instance_profile_name = dict(),