mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fixes issue 697 -- only purge the grants that need to be purged
This commit is contained in:
parent
aca24caa19
commit
646657e325
1 changed files with 21 additions and 23 deletions
|
@ -128,7 +128,7 @@ def make_rule_key(prefix, rule, group_id, cidr_ip):
|
||||||
def addRulesToLookup(rules, prefix, dict):
|
def addRulesToLookup(rules, prefix, dict):
|
||||||
for rule in rules:
|
for rule in rules:
|
||||||
for grant in rule.grants:
|
for grant in rule.grants:
|
||||||
dict[make_rule_key(prefix, rule, grant.group_id, grant.cidr_ip)] = rule
|
dict[make_rule_key(prefix, rule, grant.group_id, grant.cidr_ip)] = (rule, grant)
|
||||||
|
|
||||||
|
|
||||||
def get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id):
|
def get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id):
|
||||||
|
@ -304,8 +304,7 @@ def main():
|
||||||
|
|
||||||
# Finally, remove anything left in the groupRules -- these will be defunct rules
|
# Finally, remove anything left in the groupRules -- these will be defunct rules
|
||||||
if purge_rules:
|
if purge_rules:
|
||||||
for rule in groupRules.itervalues() :
|
for (rule, grant) in groupRules.itervalues() :
|
||||||
for grant in rule.grants:
|
|
||||||
grantGroup = None
|
grantGroup = None
|
||||||
if grant.group_id:
|
if grant.group_id:
|
||||||
grantGroup = groups[grant.group_id]
|
grantGroup = groups[grant.group_id]
|
||||||
|
@ -369,8 +368,7 @@ def main():
|
||||||
|
|
||||||
# Finally, remove anything left in the groupRules -- these will be defunct rules
|
# Finally, remove anything left in the groupRules -- these will be defunct rules
|
||||||
if purge_rules_egress:
|
if purge_rules_egress:
|
||||||
for rule in groupRules.itervalues():
|
for (rule, grant) in groupRules.itervalues():
|
||||||
for grant in rule.grants:
|
|
||||||
grantGroup = None
|
grantGroup = None
|
||||||
if grant.group_id:
|
if grant.group_id:
|
||||||
grantGroup = groups[grant.group_id].id
|
grantGroup = groups[grant.group_id].id
|
||||||
|
|
Loading…
Reference in a new issue