From 55f397a347296c10dfc8e5f5e68b55f506cf4265 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 12 Oct 2021 17:23:04 -0400 Subject: [PATCH] Fix bad location of config sets --- node-daemon/pvcnoded/util/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node-daemon/pvcnoded/util/config.py b/node-daemon/pvcnoded/util/config.py index 9083f8ea..924dfaf7 100644 --- a/node-daemon/pvcnoded/util/config.py +++ b/node-daemon/pvcnoded/util/config.py @@ -296,8 +296,6 @@ def get_configuration(): 'sriov_device': o_sysnetworks.get('sriov_device', list()) } - config = {**config, **config_networks} - if config_networks['bridge_mtu'] is None: # 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']}") @@ -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']}") config_networks['bridge_mtu'] = current_bridge_mtu + config = {**config, **config_networks} + for network_type in ['cluster', 'storage', 'upstream']: result, msg = validate_floating_ip(config, network_type) if not result: