internet/ansible-collections-openstack
3
0
Fork 0
mirror of https://opendev.org/openstack/ansible-collections-openstack.git synced 2026-05-06 13:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updated allocation pool checks"

Browse Source
This commit is contained in:
Zuul
2020-05-10 14:21:01 +00:00
committed by Gerrit Code Review
parent 25ad4882b0 95dcd82cbb
commit 1906b85668
3 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/modules/os_subnet.py
View File

@@ -205,15 +205,15 @@ def _needs_update(subnet, module, cloud, filters=None):
no_gateway_ip = module.params['no_gateway_ip']
dns = module.params['dns_nameservers']
host_routes = module.params['host_routes']
curr_pool = subnet['allocation_pools'][0]
curr_pool = dict(start=pool_start, end=pool_end)
if subnet['enable_dhcp'] != enable_dhcp:
return True
if subnet_name and subnet['name'] != subnet_name:
return True
if pool_start and curr_pool['start'] != pool_start:
if not subnet['allocation_pools'] and pool_start and pool_end:
return True
if pool_end and curr_pool['end'] != pool_end:
if subnet['allocation_pools'] and curr_pool not in subnet['allocation_pools']:
return True
if gateway_ip and subnet['gateway_ip'] != gateway_ip:
return True
@@ -352,6 +352,8 @@ def main():
changed = True
else:
if _needs_update(subnet, module, cloud, filters):
if subnet['allocation_pools'] and pool is not None:
pool = pool + subnet['allocation_pools']
cloud.update_subnet(subnet['id'],
subnet_name=subnet_name,
enable_dhcp=enable_dhcp,