Set option:mtu in inspector dnsmasq
Set the mtu for all subnets in inspector dnsmasq
config to value of 'local_mtu' in undercloud.conf.
Conflicts:
tripleoclient/tests/v1/undercloud/test_config.py
Closes-Bug: #1845487
Depends-On: Ic95dbf1867fb5397f1b6d8f23466910a97051cb6
Change-Id: Iafe3156ca0678f3ab3c5e688e712a9fb6b408e7b
(cherry picked from commit ff31fe18ec)
This commit is contained in:
Harald Jensås
parent
1f577e41dd
commit
01a7cbbad0
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
The MTU setting was not configured for Ironic Inspector DHCP (dnsmasq)
|
||||
service. This caused inspection to fail when operating on a network with
|
||||
< 1500 bytes MTU. See bug: `1845487
|
||||
<https://bugs.launchpad.net/puppet-ironic/+bug/1845487>`_.
|
||||
|
||||
|
|
@ -169,7 +169,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -241,7 +242,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -268,7 +270,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.10.100,192.168.10.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -297,7 +300,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.10.100,192.168.10.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -325,7 +329,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -351,7 +356,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -378,7 +384,8 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'}],
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500}],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
'ctlplane-subnet': {
|
||||
|
|
@ -427,17 +434,20 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'},
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.10.254',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.10.100,192.168.10.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet1'},
|
||||
'tag': 'subnet1',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.20.254',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.20.100,192.168.20.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet2'}
|
||||
'tag': 'subnet2',
|
||||
'mtu': 1500}
|
||||
],
|
||||
'MasqueradeNetworks': {
|
||||
'192.168.10.0/24': ['192.168.24.0/24',
|
||||
|
|
@ -505,17 +515,20 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'},
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.10.254',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.10.100,192.168.10.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet1'},
|
||||
'tag': 'subnet1',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.20.254',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.20.100,192.168.20.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet2'}
|
||||
'tag': 'subnet2',
|
||||
'mtu': 1500}
|
||||
],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
|
|
@ -563,12 +576,14 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'},
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.10.254',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.10.200,192.168.10.254',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet1'},
|
||||
'tag': 'subnet1',
|
||||
'mtu': 1500},
|
||||
],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
|
|
@ -610,12 +625,14 @@ class TestNetworkSettings(base.TestCase):
|
|||
'host_routes': [],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'},
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.10.222',
|
||||
'host_routes': [],
|
||||
'ip_range': '192.168.10.100,192.168.10.199',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet1'},
|
||||
'tag': 'subnet1',
|
||||
'mtu': 1500},
|
||||
],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
|
|
@ -677,19 +694,22 @@ class TestNetworkSettings(base.TestCase):
|
|||
'nexthop': '192.168.24.1'}],
|
||||
'ip_range': '192.168.24.100,192.168.24.120',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'ctlplane-subnet'},
|
||||
'tag': 'ctlplane-subnet',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.10.254',
|
||||
'host_routes': [{'destination': '10.10.10.254/32',
|
||||
'nexthop': '192.168.10.254'}],
|
||||
'ip_range': '192.168.10.100,192.168.10.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet1'},
|
||||
'tag': 'subnet1',
|
||||
'mtu': 1500},
|
||||
{'gateway': '192.168.20.254',
|
||||
'host_routes': [{'destination': '10.10.10.254/32',
|
||||
'nexthop': '192.168.20.254'}],
|
||||
'ip_range': '192.168.20.100,192.168.20.189',
|
||||
'netmask': '255.255.255.0',
|
||||
'tag': 'subnet2'}
|
||||
'tag': 'subnet2',
|
||||
'mtu': 1500}
|
||||
],
|
||||
'MasqueradeNetworks': {},
|
||||
'UndercloudCtlplaneSubnets': {
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@ def _generate_inspection_subnets():
|
|||
env_dict['netmask'] = str(netaddr.IPNetwork(s.cidr).netmask)
|
||||
env_dict['gateway'] = s.gateway
|
||||
env_dict['host_routes'] = s.host_routes
|
||||
env_dict['mtu'] = CONF.local_mtu
|
||||
env_list.append(env_dict)
|
||||
return env_list
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue