openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Handle DNS domain for metadata

Browse Source 
Pass the dns-domain over the cloud-compute relation to nova-compute.

Change-Id: I184e955488881e7329b1e4a1670261a88ec4f7fa
Partial-Bug: #1805645
This commit is contained in:
David Ames
2020-01-08 11:31:10 -08:00
parent f2b738c2ef
commit bc1bb8ffe7
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/nova_cc_hooks.py
View File

@@ -518,6 +518,9 @@ def neutron_settings():
neutron_api_info['neutron_security_groups'], neutron_api_info['neutron_security_groups'],
'quantum_url': neutron_api_info['neutron_url'], 'quantum_url': neutron_api_info['neutron_url'],
}) })
# DNS domain is optional
if neutron_api_info.get('dns_domain'):
neutron_settings['dns_domain'] = neutron_api_info['dns_domain']
neutron_url = urlparse(neutron_settings['quantum_url']) neutron_url = urlparse(neutron_settings['quantum_url'])
neutron_settings['quantum_host'] = neutron_url.hostname neutron_settings['quantum_host'] = neutron_url.hostname
neutron_settings['quantum_port'] = neutron_url.port neutron_settings['quantum_port'] = neutron_url.port

2
unit_tests/test_nova_cc_hooks.py
View File

@@ -605,6 +605,7 @@ class NovaCCHooksTests(CharmTestCase):
'neutron_plugin': 'bob', 'neutron_plugin': 'bob',
'neutron_security_groups': 'yes', 'neutron_security_groups': 'yes',
'neutron_url': 'http://nova-cc-host1:9696', 'neutron_url': 'http://nova-cc-host1:9696',
'dns_domain': 'example.tld',
} }
napi.return_value = mock_NeutronAPIContext napi.return_value = mock_NeutronAPIContext
@@ -635,6 +636,7 @@ class NovaCCHooksTests(CharmTestCase):
network_manager='neutron', network_manager='neutron',
enable_serial_console='false', enable_serial_console='false',
serial_console_base_url='ws://controller:6803', serial_console_base_url='ws://controller:6803',
dns_domain='example.tld',
**FAKE_KS_AUTH_CFG) **FAKE_KS_AUTH_CFG)
@patch('charmhelpers.contrib.openstack.ip.canonical_url') @patch('charmhelpers.contrib.openstack.ip.canonical_url')