Browse Source

Partial Revert "Don't pass the DNSServers param in undercloud env"

This partially reverts commit f1450b3ae8.

Reason for revert: undercloud_nameservers is supposed to configured
/etc/resolv.conf. The previous patch broke the link between the
configuration and the os-net-config configuration to ensure that
/etc/resolv.conf was updated at install time.

NOTE: This only affects Train through Victoria as we rewrote the network
configuration in Wallaby.

Closes-Bug: #1929117
Change-Id: Ibec901441952ee3336ca3a6b7b4381c97d326d22
changes/80/792480/1
Alex Schultz 2 months ago
parent
commit
bf586c4c94
  1. 14
      tripleoclient/tests/v1/undercloud/test_config.py
  2. 1
      tripleoclient/v1/undercloud_config.py

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

@ -175,6 +175,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -223,6 +224,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
'MysqlIPv6': True,
'IronicIpVersion': '6',
'ControlPlaneStaticRoutes': [],
'DnsServers': '10.10.10.10,10.10.10.11',
'IronicInspectorSubnets': [
{'gateway': 'fd12:3456:789a:1::1',
'host_routes': [],
@ -273,6 +275,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
'MysqlIPv6': True,
'IronicIpVersion': '6',
'ControlPlaneStaticRoutes': [],
'DnsServers': '10.10.10.10,10.10.10.11',
'IronicInspectorSubnets': [
{'gateway': 'fd12:3456:789a:1::1',
'host_routes': [],
@ -346,6 +349,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -377,6 +381,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.10.1',
@ -410,6 +415,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.10.1',
@ -442,6 +448,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -472,6 +479,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -503,6 +511,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [],
'IronicInspectorSubnets': [
{'gateway': '192.168.24.1',
@ -557,6 +566,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'destination': '192.168.10.0/24', 'nexthop': '192.168.24.1'},
{'destination': '192.168.20.0/24', 'nexthop': '192.168.24.1'}],
@ -646,6 +656,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'destination': '192.168.10.0/24', 'nexthop': '192.168.24.1'},
{'destination': '192.168.20.0/24', 'nexthop': '192.168.24.1'}],
@ -715,6 +726,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'destination': '192.168.10.0/24', 'nexthop': '192.168.24.1'}],
'IronicInspectorSubnets': [
@ -769,6 +781,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'destination': '192.168.10.0/24', 'nexthop': '192.168.24.1'}],
'IronicInspectorSubnets': [
@ -841,6 +854,7 @@ class TestNetworkSettings(TestBaseNetworkSettings):
env = {}
undercloud_config._process_network_args(env)
expected = {
'DnsServers': '10.10.10.10,10.10.10.11',
'ControlPlaneStaticRoutes': [
{'destination': '192.168.10.0/24', 'nexthop': '192.168.24.1'},
{'destination': '192.168.20.0/24', 'nexthop': '192.168.24.1'},

1
tripleoclient/v1/undercloud_config.py

@ -397,6 +397,7 @@ 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

Loading…
Cancel
Save