openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Don't pass the DNSServers param in undercloud env"

This commit is contained in:
Zuul 2019-07-03 12:12:21 +00:00 committed by Gerrit Code Review
parent 8187347eb2 f1450b3ae8
commit ba2b615917
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/per-subnet-nameservers-d53b5cdc6d099a6a.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Undercloud ``ctlplane`` subnets can now have individual nameservers
(per-subnet option ``dns_nameservers``). If no subnet specific nameservers
are specified for a subnet it will fall back to ``undercloud_nameservers``.

13
tripleoclient/tests/v1/undercloud/test_config.py
View File

@ -165,7 +165,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -209,7 +208,6 @@ class TestNetworkSettings(base.TestCase):
'RedisIPv6': True,
'MysqlIPv6': True,
'ControlPlaneStaticRoutes': [],
'DnsServers': '10.10.10.10,10.10.10.11',
'IronicInspectorSubnets': [
{'gateway': 'fd12:3456:789a:1::1',
'host_routes': [],
@ -245,7 +243,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -273,7 +270,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.10.1',
@ -303,7 +299,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.10.1',
@ -332,7 +327,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -359,7 +353,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -387,7 +380,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -438,7 +430,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'},
{'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'}],
@ -521,7 +512,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'},
{'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'}],
@ -584,7 +574,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}],
'IronicInspectorSubnets': [
@ -634,7 +623,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}],
'IronicInspectorSubnets': [
@ -702,7 +690,6 @@ class TestNetworkSettings(base.TestCase):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'},
{'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'},

1
tripleoclient/v1/undercloud_config.py
View File

@ -356,7 +356,6 @@ def _process_network_args(env):
'Please provide less than 6 '
'servers in undercloud_'
'nameservers.')
env['DnsServers'] = ','.join(CONF['undercloud_nameservers'])
if netaddr.IPNetwork(CONF['local_ip']).version == 6:
env['NovaIPv6'] = True
env['RabbitIPv6'] = True