Add missing params to get_target_from_rule

get_target_from_rule was extracted from main() without enough parameters for
all the local variables it took with it from the extraction site.
This commit is contained in:
Jacob Hickey 2014-07-17 11:03:38 -04:00
parent 64b874129f
commit ea9af2cbb1

View file

@ -106,7 +106,7 @@ def addRulesToLookup(rules, prefix, dict):
grant.group_id, grant.cidr_ip)] = rule grant.group_id, grant.cidr_ip)] = rule
def get_target_from_rule(module, rule, name, group, groups): def get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id):
""" """
Returns tuple of (group_id, ip) after validating rule params. Returns tuple of (group_id, ip) after validating rule params.
@ -249,7 +249,7 @@ def main():
# Now, go through all provided rules and ensure they are there. # Now, go through all provided rules and ensure they are there.
if rules: if rules:
for rule in rules: for rule in rules:
group_id, ip, target_group_created = get_target_from_rule(module, rule, name, group, groups) group_id, ip, target_group_created = get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id)
if target_group_created: if target_group_created:
changed = True changed = True
@ -289,7 +289,7 @@ def main():
# Now, go through all provided rules and ensure they are there. # Now, go through all provided rules and ensure they are there.
if rules_egress: if rules_egress:
for rule in rules_egress: for rule in rules_egress:
group_id, ip, target_group_created = get_target_from_rule(module, rule, name, group, groups) group_id, ip, target_group_created = get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id)
if target_group_created: if target_group_created:
changed = True changed = True