Commit 187ebf2f by Michael DeHaan

Leverage 4318b27 and no longer treat instance tags as JSON, but as dictionary…

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.
parent 465f3b1c
...@@ -476,7 +476,7 @@ def create_instances(module, ec2): ...@@ -476,7 +476,7 @@ def create_instances(module, ec2):
if instance_tags: if instance_tags:
try: try:
ec2.create_tags(instids, module.from_json(instance_tags)) ec2.create_tags(instids, instance_tags)
except boto.exception.EC2ResponseError as e: except boto.exception.EC2ResponseError as e:
module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message)) module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message))
...@@ -577,7 +577,7 @@ def main(): ...@@ -577,7 +577,7 @@ def main():
aws_access_key = dict(aliases=['ec2_access_key', 'access_key']), aws_access_key = dict(aliases=['ec2_access_key', 'access_key']),
placement_group = dict(), placement_group = dict(),
user_data = dict(), user_data = dict(),
instance_tags = dict(), instance_tags = dict(type='dict'),
vpc_subnet_id = dict(), vpc_subnet_id = dict(),
private_ip = dict(), private_ip = dict(),
instance_profile_name = dict(), instance_profile_name = dict(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment