From 4a06685098cc2e9b69c1b961eecef957314faf85 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Thu, 23 Dec 2021 21:22:35 +0530 Subject: [OVN] Correctly set dns_server in dhcpv4/v6 options When ovn/dns_servers consist of IPv6 dns nameservers, it was getting added to IPv4 dhcp options also, and due to this an invalid nameserver(last 4 octets of an IPv6 address) is set in the instances. This patch filters IPv4/IPv6 dns nameservers and set dhcpv4/dhcpv6 options accordingly. Also when dns_nameservers are not set for IPv6 subnets, get those from ovn/dns_servers config or system nameservers just like it's done with the IPv4 subnets. Updated get_system_dns_resolvers to pick both IPv4/IPv6 valid ips, this also requires bump of oslo.utils minimum version to 4.8.0 to use strict option for IPv4[1]. Additionally fix some unit tests which were setting IPv4 dns nameservers on the IPv6 subnets, this is not allowed with api. [1] https://github.com/openstack/oslo.utils/commit/3288539 Closes-Bug: #1951816 Change-Id: I9f914e721201072e43a8c6c266ed97ca85fcc13d --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'requirements.txt') diff --git a/requirements.txt b/requirements.txt index 808b78d191..76c0c049a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0 oslo.service>=1.31.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0 -oslo.utils>=4.5.0 # Apache-2.0 +oslo.utils>=4.8.0 # Apache-2.0 oslo.versionedobjects>=1.35.1 # Apache-2.0 osprofiler>=2.3.0 # Apache-2.0 os-ken>=2.2.0 # Apache-2.0 -- cgit v1.2.1