ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

os_subnet: add support for using the default subnetpool (#20191)

Browse source 
Allows to pass use_default_subnetpool instead of a cidr. This is
required when adding an IPv6 subnet if BGP or prefix delegation is
enabled.
This commit is contained in:
Paulo Matias 2017-02-21 10:27:59 -03:00 • committed by Ricardo Carrillo Cruz
parent 2567e8157f
commit 46fee994d1
1 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/ansible/modules/cloud/openstack/os_subnet.py
View file

@ -50,7 +50,8 @@ options:
cidr: cidr:
description: description:
- The CIDR representation of the subnet that should be assigned to - The CIDR representation of the subnet that should be assigned to
the subnet. Required when I(state) is 'present' the subnet. Required when I(state) is 'present' and a subnetpool
is not specified.
required: false required: false
default: None default: None
ip_version: ip_version:
@ -108,6 +109,11 @@ options:
choices: ['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac'] choices: ['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac']
required: false required: false
default: None default: None
use_default_subnetpool:
description:
- Use the default subnetpool for I(ip_version) to obtain a CIDR.
required: false
default: false
project: project:
description: description:
- Project name or ID containing the subnet (name admin-only) - Project name or ID containing the subnet (name admin-only)
@ -165,6 +171,9 @@ except ImportError:
HAS_SHADE = False HAS_SHADE = False
from distutils.version import StrictVersion
def _can_update(subnet, module, cloud): def _can_update(subnet, module, cloud):
"""Check for differences in non-updatable values""" """Check for differences in non-updatable values"""
network_name = module.params['network_name'] network_name = module.params['network_name']
@ -256,6 +265,7 @@ def main():
host_routes=dict(default=None, type='list'), host_routes=dict(default=None, type='list'),
ipv6_ra_mode=dict(default=None, choice=ipv6_mode_choices), ipv6_ra_mode=dict(default=None, choice=ipv6_mode_choices),
ipv6_address_mode=dict(default=None, choice=ipv6_mode_choices), ipv6_address_mode=dict(default=None, choice=ipv6_mode_choices),
use_default_subnetpool=dict(default=False, type='bool'),
state=dict(default='present', choices=['absent', 'present']), state=dict(default='present', choices=['absent', 'present']),
project=dict(default=None) project=dict(default=None)
) )
@ -282,13 +292,21 @@ def main():
host_routes = module.params['host_routes'] host_routes = module.params['host_routes']
ipv6_ra_mode = module.params['ipv6_ra_mode'] ipv6_ra_mode = module.params['ipv6_ra_mode']
ipv6_a_mode = module.params['ipv6_address_mode'] ipv6_a_mode = module.params['ipv6_address_mode']
use_default_subnetpool = module.params['use_default_subnetpool']
project = module.params.pop('project') project = module.params.pop('project')
if (use_default_subnetpool and
StrictVersion(shade.__version__) < StrictVersion('1.16.0')):
module.fail_json(msg="To utilize use_default_subnetpool, the installed"
" version of the shade library MUST be >=1.16.0")
# Check for required parameters when state == 'present' # Check for required parameters when state == 'present'
if state == 'present': if state == 'present':
for p in ['network_name', 'cidr']: if not module.params['network_name']:
if not module.params[p]: module.fail_json(msg='network_name required with present state')
module.fail_json(msg='%s required with present state' % p) if not module.params['cidr'] and not use_default_subnetpool:
module.fail_json(msg='cidr or use_default_subnetpool required '
'with present state')
if pool_start and pool_end: if pool_start and pool_end:
pool = [dict(start=pool_start, end=pool_end)] pool = [dict(start=pool_start, end=pool_end)]
@ -320,18 +338,20 @@ def main():
if state == 'present': if state == 'present':
if not subnet: if not subnet:
subnet = cloud.create_subnet(network_name, cidr, subnet = cloud.create_subnet(
ip_version=ip_version, network_name, cidr,
enable_dhcp=enable_dhcp, ip_version=ip_version,
subnet_name=subnet_name, enable_dhcp=enable_dhcp,
gateway_ip=gateway_ip, subnet_name=subnet_name,
disable_gateway_ip=no_gateway_ip, gateway_ip=gateway_ip,
dns_nameservers=dns, disable_gateway_ip=no_gateway_ip,
allocation_pools=pool, dns_nameservers=dns,
host_routes=host_routes, allocation_pools=pool,
ipv6_ra_mode=ipv6_ra_mode, host_routes=host_routes,
ipv6_address_mode=ipv6_a_mode, ipv6_ra_mode=ipv6_ra_mode,
tenant_id=project_id) ipv6_address_mode=ipv6_a_mode,
use_default_subnetpool=use_default_subnetpool,
tenant_id=project_id)
changed = True changed = True
else: else:
if _needs_update(subnet, module, cloud): if _needs_update(subnet, module, cloud):