From 4d52d0748f0b00564dff81c2afc0366982127060 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 13 Jun 2016 11:24:26 -0400 Subject: [PATCH] Include core ec2 fix for tag sync limit --- awx/plugins/inventory/ec2.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/plugins/inventory/ec2.py b/awx/plugins/inventory/ec2.py index bf3ba28ea0..6068df901f 100755 --- a/awx/plugins/inventory/ec2.py +++ b/awx/plugins/inventory/ec2.py @@ -527,7 +527,11 @@ class Ec2Inventory(object): instance_ids = [] for reservation in reservations: instance_ids.extend([instance.id for instance in reservation.instances]) - tags = conn.get_all_tags(filters={'resource-type': 'instance', 'resource-id': instance_ids}) + max_filter_value = 199 + tags = [] + for i in range(0, len(instance_ids), max_filter_value): + tags.extend(conn.get_all_tags(filters={'resource-type': 'instance', 'resource-id': instance_ids[i:i+max_filter_value]})) + tags_by_instance_id = defaultdict(dict) for tag in tags: tags_by_instance_id[tag.res_id][tag.name] = tag.value