openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Set option:mtu in inspector dnsmasq"

This commit is contained in:
Zuul 2019-10-08 04:26:51 +00:00 committed by Gerrit Code Review
parent a7187a80c9 ff31fe18ec
commit 8b9bb10455
3 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/fix-pass-mtu-option-inspector-dnsmasq-7c2f9d7d358ace07.yaml Normal file
View File

@ -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>`_.

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

@ -165,7 +165,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': {
@ -208,7 +209,8 @@ class TestNetworkSettings(base.TestCase):
'host_routes': [],
'ip_range': 'fd12:3456:789a:1::30,fd12:3456:789a:1::40',
'netmask': 'ffff:ffff:ffff:ffff::',
'tag': 'ctlplane-subnet'}],
'tag': 'ctlplane-subnet',
'mtu': 1500}],
'MasqueradeNetworks': {},
'UndercloudCtlplaneSubnets': {
'ctlplane-subnet': {
@ -282,7 +284,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': {
@ -309,7 +312,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': {
@ -338,7 +342,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': {
@ -366,7 +371,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': {
@ -392,7 +398,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': {
@ -419,7 +426,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': {
@ -471,17 +479,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',
@ -553,17 +564,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': {
@ -614,12 +628,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': {
@ -663,12 +679,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': {
@ -733,19 +751,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': {

1
tripleoclient/v1/undercloud_config.py
View File

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