ec2_group: select own group if the name matches

This fixes an issue where multiple VPC have the same group name and
the one from the other VPC is selected.
reviewable/pr18780/r1
zimbatm 10 years ago
parent 78de8bbd99
commit 8a4d5856ce

@ -162,12 +162,12 @@ def get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id):
group_id = rule['group_id'] group_id = rule['group_id']
elif 'group_name' in rule: elif 'group_name' in rule:
group_name = rule['group_name'] group_name = rule['group_name']
if group_name in groups: if group_name == name:
group_id = groups[group_name].id
elif group_name == name:
group_id = group.id group_id = group.id
groups[group_id] = group groups[group_id] = group
groups[group_name] = group groups[group_name] = group
elif group_name in groups:
group_id = groups[group_name].id
else: else:
if not rule.get('group_desc', '').strip(): if not rule.get('group_desc', '').strip():
module.fail_json(msg="group %s will be automatically created by rule %s and no description was provided" % (group_name, rule)) module.fail_json(msg="group %s will be automatically created by rule %s and no description was provided" % (group_name, rule))

Loading…
Cancel
Save