Hello Alon Bar-Lev, Mark Wu, Antoni Segura Puimedon,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/17771
to review the following change.
Change subject: vdsm_reg: fix ovirt_node without default bridge
......................................................................
vdsm_reg: fix ovirt_node without default bridge
This patch reflects the fact that nowadays ovirt-node usually
doesn't have a br* interface by default, thus the standing
assumption that it did lead to exceptions.
Change-Id: I01b761e4fa134850875a4118d40359df72ffd0ef
Bug-Url: https://bugzilla.redhat.com/988990
Signed-off-by: Antoni S. Puimedon <[email protected]>
Reviewed-on: http://gerrit.ovirt.org/17730
Reviewed-by: Alon Bar-Lev <[email protected]>
Reviewed-by: Mark Wu <[email protected]>
Reviewed-by: Dan Kenigsberg <[email protected]>
Tested-by: Dan Kenigsberg <[email protected]>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/17771/1
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index de0ac41..857c33c 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -1056,7 +1056,7 @@
# No more handling GATEWAYDEV.
if fReturn:
- if fIsOvirt:
+ if fIsOvirt and fIsBridgeDevice:
vlan, bonding, nic = _getOvirtBridgeParams(mgtBridge)
else:
vlan, bonding, nic = _getRHELBridgeParams(mgtIface,
@@ -1064,7 +1064,7 @@
fReturn = (nic is not None)
#Delete existing bridge in oVirt
- if fReturn and fIsOvirt:
+ if fReturn and fIsOvirt and fIsBridgeDevice:
try:
out, err, ret = _logExec([os.path.join(vdsmDir, SCRIPT_NAME_DEL),
mgtBridge, vlan, bonding, nic])
--
To view, visit http://gerrit.ovirt.org/17771
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b761e4fa134850875a4118d40359df72ffd0ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Antoni Segura Puimedon <[email protected]>
Gerrit-Reviewer: Mark Wu <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
