openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Ensure mtu is set correctly on ctlplane"

This commit is contained in:
Zuul 2018-03-14 19:19:52 +00:00 committed by Gerrit Code Review
parent 26e96210c7 1bc7a07dec
commit cb3a63e5b7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instack_undercloud/tests/test_undercloud.py
View File

@ -1412,7 +1412,7 @@ class TestPostConfig(BaseTestCase):
undercloud._ensure_neutron_network(mock_sdk)
mock_sdk.network.create_network.assert_called_with(
name='ctlplane', provider_network_type='flat',
provider_physical_network='ctlplane')
provider_physical_network='ctlplane', mtu=1500)
def test_delete_default_segment(self):
mock_sdk = self._neutron_mocks()

3
instack_undercloud/undercloud.py
View File

@ -2020,9 +2020,10 @@ def _ensure_neutron_network(sdk):
try:
network = list(sdk.network.networks(name=PHYSICAL_NETWORK))
if not network:
mtu = CONF.get("local_mtu")
network = sdk.network.create_network(
name=PHYSICAL_NETWORK, provider_network_type='flat',
provider_physical_network=PHYSICAL_NETWORK)
provider_physical_network=PHYSICAL_NETWORK, mtu=mtu)
LOG.info("Network created %s", network)
# (hjensas) Delete the default segment, we create a new segment
# per subnet later.