diff --git a/changelogs/fragments/64495-os_network-openstacksdk-min.yml b/changelogs/fragments/64495-os_network-openstacksdk-min.yml new file mode 100644 index 00000000000..7fd35acb785 --- /dev/null +++ b/changelogs/fragments/64495-os_network-openstacksdk-min.yml @@ -0,0 +1,3 @@ +bugfixes: + - bump the minimum openstacksdk version when os_network + uses the dns_domain argument diff --git a/lib/ansible/modules/cloud/openstack/os_network.py b/lib/ansible/modules/cloud/openstack/os_network.py index 79f4b0f9e35..3e036b5eecc 100644 --- a/lib/ansible/modules/cloud/openstack/os_network.py +++ b/lib/ansible/modules/cloud/openstack/os_network.py @@ -129,7 +129,7 @@ network: type: int sample: 0 dns_domain: - description: The DNS domain of a network resource. + description: The DNS domain of a network resource. Requires openstacksdk>=0.29. type: str sample: "sample.openstack.org." admin_state_up: @@ -197,12 +197,18 @@ def main(): provider_physical_network = module.params['provider_physical_network'] provider_network_type = module.params['provider_network_type'] provider_segmentation_id = module.params['provider_segmentation_id'] - project = module.params.get('project') - port_security_enabled = module.params.get('port_security_enabled') - mtu = module.params.get('mtu') - dns_domain = module.params.get('dns_domain') + project = module.params['project'] - sdk, cloud = openstack_cloud_from_module(module) + net_create_kwargs = { + 'port_security_enabled': module.params['port_security_enabled'], + 'mtu_size': module.params['mtu'] + } + + if module.params['dns_domain'] is not None: + sdk, cloud = openstack_cloud_from_module(module, min_version='0.29.0') + net_create_kwargs['dns_domain'] = module.params['dns_domain'] + else: + sdk, cloud = openstack_cloud_from_module(module) try: if project is not None: proj = cloud.get_project(project) @@ -228,13 +234,11 @@ def main(): if project_id is not None: net = cloud.create_network(name, shared, admin_state_up, external, provider, project_id, - port_security_enabled=port_security_enabled, - mtu_size=mtu, dns_domain=dns_domain) + **net_create_kwargs) else: net = cloud.create_network(name, shared, admin_state_up, external, provider, - port_security_enabled=port_security_enabled, - mtu_size=mtu, dns_domain=dns_domain) + **net_create_kwargs) changed = True else: changed = False