Sync the dns-assignment with the actual designate dns-domain
When a port is created the dns-assignment (dns-domain part)
was always taken form Neutron config dns_domain which is not
always true, since it could be Neutron network dns_domain or
the dns_domain sent when creating the port
Change-Id: I7f4366ff5a26f73013433bfbfb299fd06294f359
Closes-Bug:1873091
(cherry picked from commit ea13f2e83f
)
This commit is contained in:
parent
c81fb5b394
commit
1f1e45da6a
@ -282,6 +282,8 @@ class DNSExtensionDriver(api.ExtensionDriver):
|
||||
if dns_domain and dns_domain != lib_const.DNS_DOMAIN_DEFAULT:
|
||||
if dns_data_db:
|
||||
dns_name = dns_data_db.dns_name
|
||||
if dns_data_db.current_dns_domain:
|
||||
dns_domain = dns_data_db.current_dns_domain
|
||||
return dns_name, dns_domain
|
||||
|
||||
def _get_dns_names_for_port(self, ips, dns_data_db):
|
||||
|
@ -164,6 +164,9 @@ class DNSIntegrationTestCase(test_plugin.Ml2PluginV2TestCase):
|
||||
self.assertEqual(current_dns_name, dns_data_db['current_dns_name'])
|
||||
self.assertEqual(previous_dns_name,
|
||||
dns_data_db['previous_dns_name'])
|
||||
curr_dns_domain = dns_data_db['current_dns_domain']
|
||||
for fqdn in port['dns_assignment']:
|
||||
self.assertTrue(fqdn['fqdn'].endswith(curr_dns_domain))
|
||||
if current_dns_name:
|
||||
self.assertEqual(current_dns_domain,
|
||||
dns_data_db['current_dns_domain'])
|
||||
|
@ -0,0 +1,6 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The dns-assignment will reflect the dns-domain defined in the network or
|
||||
sent by user when creating the port using --dns-domain rather than just
|
||||
take the dns-domain defined in the neutron configuration
|
Loading…
Reference in New Issue
Block a user