openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Partial Revert "Don't pass the DNSServers param in undercloud env"" into stable/train

This commit is contained in:
Zuul 2021-06-03 22:19:26 +00:00 committed by Gerrit Code Review
parent 95feb7c229 4421aadf62
commit 7491510ac7
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.24.1', {'gateway': '192.168.24.1',
@ -222,6 +223,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
'MysqlIPv6': True, 'MysqlIPv6': True,
'IronicIpVersion': '6', 'IronicIpVersion': '6',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'DnsServers': '10.10.10.10,10.10.10.11',
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': 'fd12:3456:789a:1::1', {'gateway': 'fd12:3456:789a:1::1',
'host_routes': [], 'host_routes': [],
@ -271,6 +273,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
'MysqlIPv6': True, 'MysqlIPv6': True,
'IronicIpVersion': '6', 'IronicIpVersion': '6',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'DnsServers': '10.10.10.10,10.10.10.11',
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': 'fd12:3456:789a:1::1', {'gateway': 'fd12:3456:789a:1::1',
'host_routes': [], 'host_routes': [],
@ -343,6 +346,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.24.1', {'gateway': '192.168.24.1',
@ -373,6 +377,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.10.1', {'gateway': '192.168.10.1',
@ -405,6 +410,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.10.1', {'gateway': '192.168.10.1',
@ -436,6 +442,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.24.1', {'gateway': '192.168.24.1',
@ -465,6 +472,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.24.1', {'gateway': '192.168.24.1',
@ -495,6 +503,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [], 'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
{'gateway': '192.168.24.1', {'gateway': '192.168.24.1',
@ -548,6 +557,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [ 'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}, {'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'}], {'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'}],
@ -634,6 +644,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [ 'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}, {'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'}], {'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'}],
@ -700,6 +711,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [ 'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}], {'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
@ -752,6 +764,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [ 'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}], {'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}],
'IronicInspectorSubnets': [ 'IronicInspectorSubnets': [
@ -822,6 +835,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {} env = {}
undercloud_config._process_network_args(env) undercloud_config._process_network_args(env)
expected = { expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [ 'ControlPlaneStaticRoutes': [
{'ip_netmask': '192.168.10.0/24', 'next_hop': '192.168.24.1'}, {'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'}, {'ip_netmask': '192.168.20.0/24', 'next_hop': '192.168.24.1'},

1
tripleoclient/v1/undercloud_config.py
View File

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