internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-01 08:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for 11177 where module readds rule even if the rules exists

Browse Source
This commit is contained in:
Benno Joy
2015-06-05 12:31:59 +05:30
committed by Matt Clay
parent 29115f0602
commit f6f2359400
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/cloud/amazon/ec2_group.py
View File

@@ -127,6 +127,11 @@ def make_rule_key(prefix, rule, group_id, cidr_ip):
"""Creates a unique key for an individual group rule"""
if isinstance(rule, dict):
proto, from_port, to_port = [rule.get(x, None) for x in ('proto', 'from_port', 'to_port')]
#fix for 11177
if proto not in ['icmp', 'tcp', 'udp'] and from_port == -1 and to_port == -1:
from_port = 'none'
to_port = 'none'
else: # isinstance boto.ec2.securitygroup.IPPermissions
proto, from_port, to_port = [getattr(rule, x, None) for x in ('ip_protocol', 'from_port', 'to_port')]