From 9df061369fb3ba41432ae79c121d4aa334ca9d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Tue, 8 Oct 2019 18:02:20 +0200 Subject: [PATCH] Set option:mtu in inspector dnsmasq Set the mtu for all subnets in inspector dnsmasq config to value of 'local_mtu' in undercloud.conf. Change-Id: I2c6759f750de335b81c6335da7be8e09375c981a Closes-Bug: #1845487 Depends-On: Ic95dbf1867fb5397f1b6d8f23466910a97051cb6 --- instack_undercloud/tests/test_undercloud.py | 6 +++--- instack_undercloud/undercloud.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py index 177c0f8e9..c0db5f41c 100644 --- a/instack_undercloud/tests/test_undercloud.py +++ b/instack_undercloud/tests/test_undercloud.py @@ -668,7 +668,7 @@ class TestGenerateEnvironment(BaseTestCase): env = undercloud._generate_environment('.') reference = [{"tag": "ctlplane-subnet", "gateway": "192.168.24.1", "ip_range": "192.168.24.100,192.168.24.120", - "netmask": "255.255.255.0"}] + "netmask": "255.255.255.0", "mtu": 1500}] actual = json.loads(env['INSPECTION_SUBNETS']) self.assertEqual(reference, actual) @@ -690,10 +690,10 @@ class TestGenerateEnvironment(BaseTestCase): env = undercloud._generate_environment('.') reference = [{"tag": "subnet1", "gateway": "192.168.10.254", "ip_range": "192.168.10.100,192.168.10.189", - "netmask": "255.255.255.0"}, + "netmask": "255.255.255.0", "mtu": 1500}, {"tag": "subnet2", "gateway": "192.168.20.254", "ip_range": "192.168.20.100,192.168.20.189", - "netmask": "255.255.255.0"}] + "netmask": "255.255.255.0", "mtu": 1500}] actual = json.loads(env['INSPECTION_SUBNETS']) self.assertEqual(reference, actual) diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 0e938dbab..fc917d1e1 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -1280,6 +1280,7 @@ def _generate_inspection_subnets(): env_dict['ip_range'] = s.inspection_iprange env_dict['netmask'] = str(netaddr.IPNetwork(s.cidr).netmask) env_dict['gateway'] = s.gateway + env_dict['mtu'] = CONF.local_mtu env_list.append(env_dict) return json.dumps(env_list)