parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Fix bad location of config sets

This commit is contained in:
Joshua Boniface 2021-10-12 17:23:04 -04:00
parent dfebb2d3e5
commit 55f397a347
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node-daemon/pvcnoded/util/config.py
View File

@ -296,8 +296,6 @@ def get_configuration():
'sriov_device': o_sysnetworks.get('sriov_device', list()) 'sriov_device': o_sysnetworks.get('sriov_device', list())
} }
config = {**config, **config_networks}
if config_networks['bridge_mtu'] is None: if config_networks['bridge_mtu'] is None:
# Read the current MTU of bridge_dev and set bridge_mtu to it; avoids weird resets # Read the current MTU of bridge_dev and set bridge_mtu to it; avoids weird resets
retcode, stdout, stderr = common.run_os_command(f"ip -json link show dev {config_networks['bridge_dev']}") retcode, stdout, stderr = common.run_os_command(f"ip -json link show dev {config_networks['bridge_dev']}")
@ -305,6 +303,8 @@ def get_configuration():
print(f"Config key bridge_mtu not explicitly set; using live MTU {current_bridge_mtu} from {config_networks['bridge_dev']}") print(f"Config key bridge_mtu not explicitly set; using live MTU {current_bridge_mtu} from {config_networks['bridge_dev']}")
config_networks['bridge_mtu'] = current_bridge_mtu config_networks['bridge_mtu'] = current_bridge_mtu
config = {**config, **config_networks}
for network_type in ['cluster', 'storage', 'upstream']: for network_type in ['cluster', 'storage', 'upstream']:
result, msg = validate_floating_ip(config, network_type) result, msg = validate_floating_ip(config, network_type)
if not result: if not result: