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

os_subnet: allow using non-default subnet pool (#52608)

Browse source 
(cherry picked from commit 17f2b5f73e)
This commit is contained in:
James Cassell 2019-08-01 10:11:53 -04:00 committed by Toshio Kuratomi
parent 04ca93a5c0
commit a307a6a89a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/fragments/os_subnet-subnetpool-id-allowed.yaml Normal file
View file

@ -0,0 +1,5 @@
---
bugfixes:
- >
os_subnet - it is valid to specify an explicit ``subnetpool_id`` rather than
``use_default_subnetpool`` or ``cidr``

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

@ -272,9 +272,10 @@ def main():
if state == 'present': if state == 'present':
if not module.params['network_name']: if not module.params['network_name']:
module.fail_json(msg='network_name required with present state') module.fail_json(msg='network_name required with present state')
if not module.params['cidr'] and not use_default_subnetpool: if (not module.params['cidr'] and not use_default_subnetpool and
module.fail_json(msg='cidr or use_default_subnetpool required ' not extra_specs.get('subnetpool_id', False)):
'with present state') module.fail_json(msg='cidr or use_default_subnetpool or '
'subnetpool_id 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)]