Dan Kenigsberg has uploaded a new change for review.
Change subject: deployUtil: expect integer vlan id from new netinfo
......................................................................
deployUtil: expect integer vlan id from new netinfo
Commit 8b2bbe6e5 changed netinfo.getVlanID() to return the vlan id as an
integer, istead of a string. This makes a lot of sense, but breaks
compatibility with ancient deployUtil code.
Change-Id: Ibc1c5875e0d13b110f61f9eabf6d1964fc4c1237
Bug-Url:
https://bugzilla.redhat.com/1037277
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/21948/1
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 2d379f6..ba45d64 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -1061,6 +1061,7 @@
else:
vlan, bonding, nic = _getRHELBridgeParams(mgtIface,
bridgeName=bridgeName)
+ vlan = str(vlan)
fReturn = (nic is not None)
#Delete existing bridge in oVirt
--
To view, visit
http://gerrit.ovirt.org/21948
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc1c5875e0d13b110f61f9eabf6d1964fc4c1237
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>