cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Recongnize None and -1 port equivalency

Browse source 
shade 0.7.0 represents disabled min/max ports as None (in the
neutron style) rather than -1. Recognize this as the same as -1.
This commit is contained in:
David Shrewsbury 2015-06-10 18:06:11 -04:00 • committed by Monty Taylor
parent 5758b4ebdc
commit 5b6c6cac20
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cloud/openstack/os_security_group_rule.py
View file

@ -87,9 +87,12 @@ def _security_group_rule(module, nova_client, action='create', **kwargs):
def _get_rule_from_group(module, secgroup): def _get_rule_from_group(module, secgroup):
for rule in secgroup['security_group_rules']: for rule in secgroup['security_group_rules']:
# No port, or -1, will be returned as None
port_range_min = rule['port_range_min'] or -1
port_range_max = rule['port_range_max'] or -1
if (rule['protocol'] == module.params['protocol'] and if (rule['protocol'] == module.params['protocol'] and
rule['port_range_min'] == module.params['port_range_min'] and port_range_min == module.params['port_range_min'] and
rule['port_range_max'] == module.params['port_range_max'] and port_range_max == module.params['port_range_max'] and
rule['remote_ip_prefix'] == module.params['remote_ip_prefix']): rule['remote_ip_prefix'] == module.params['remote_ip_prefix']):
return rule return rule
return None return None