Antoni Segura Puimedon has uploaded a new change for review. Change subject: Do not propagate the bridge bootproto to the underlying devices. ......................................................................
Do not propagate the bridge bootproto to the underlying devices. When adding an interface to a bridge, the bootproto was incorrectly applied also to the underlying network interfaces. This patch corrects it by setting their bootproto to none. Bug-Id: https://bugzilla.redhat.com/857112 Change-Id: Icd308c6db11d8641ecee84817c5f0b9d6e5eaf74 Signed-off-by: Antoni S. Puimedon <[email protected]> --- M vdsm/configNetwork.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/8058/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 12e5e5b..2407b41 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -905,7 +905,8 @@ # bridge -> vlan -> bond -> nic # For lower level devices we should ignore it. # reset ip, netmask, gateway for lower level devices - ipaddr = netmask = gateway = None + bridgeBootproto = options.get('bootproto') + ipaddr = netmask = gateway = options['bootproto'] = None # For VLAN we should attach bridge only to the VLAN device # rather than to underlying NICs or bond @@ -957,7 +958,7 @@ ifup(iface) if bridged: - if options.get('bootproto') == 'dhcp' and \ + if bridgeBootproto == 'dhcp' and \ not utils.tobool(options.get('blockingdhcp')): # wait for dhcp in another thread, # so vdsm won't get stuck (BZ#498940) -- To view, visit http://gerrit.ovirt.org/8058 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd308c6db11d8641ecee84817c5f0b9d6e5eaf74 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
