Dan Kenigsberg has submitted this change and it was merged.
Change subject: network: wait for a bridge to appear before disabling IPv6 on it
......................................................................
network: wait for a bridge to appear before disabling IPv6 on it
A traceback such as
File "/usr/share/vdsm/network/configurators/ifcfg.py", line 101, in
configureBridge
sysctl.disable_ipv6(bridge.name)
File "/usr/lib/python2.7/site-packages/vdsm/sysctl.py", line 42, in
disable_ipv6
with open('/proc/sys/net/ipv6/conf/%s/disable_ipv6' % dev, 'w') as f:
IOError: [Errno 2] No such file or directory:
u'/proc/sys/net/ipv6/conf/test-network/disable_ipv6'
shows that a bridge was not yet created when _ifup in ifcfg's configureBridge
already finished.
This patch makes configureBridge wait for the bridge for up to 1s. If it is
not created by then, a standard exception is triggered.
Change-Id: Ic5292e5a297ff50a0e82ba0781333e21fd9dd7f3
Signed-off-by: Ondřej Svoboda <[email protected]>
Reviewed-on: https://gerrit.ovirt.org/43583
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <[email protected]>
---
M vdsm/network/configurators/__init__.py
M vdsm/network/configurators/ifcfg.py
M vdsm/network/configurators/iproute2.py
3 files changed, 24 insertions(+), 3 deletions(-)
Approvals:
Ondřej Svoboda: Verified
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/43583
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5292e5a297ff50a0e82ba0781333e21fd9dd7f3
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Ido Barkan <[email protected]>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ondřej Svoboda <[email protected]>
Gerrit-Reviewer: Petr Horáček <[email protected]>
Gerrit-Reviewer: [email protected]
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
