Francesco Romani has uploaded a new change for review. Change subject: vdsm: prepareVolumePath payload misdetection fix ......................................................................
vdsm: prepareVolumePath payload misdetection fix The changeset http://gerrit.ovirt.org/#/c/22324/3 used a condition too broad for its check, causing a device path misdetection when cloud-init is used. This in turn makes vdsm to produce an invalid xml with duplicate cdrom IDs, culminating in a qemu failure at start. See the buzilla linked below for a full description of a misbehaviour. This patch provides a band-aid fix to the issue by tightening the prepareVolumePath check. Bug-Url: https://bugzilla.redhat.com/1047356 Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Signed-off-by: Francesco Romani <from...@redhat.com> --- M vdsm/clientIF.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/22923/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index e8fb8d1..b101896 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -308,7 +308,8 @@ # next line can be removed in future, when < 3.3 engine # is not supported drive['specParams'].get('path', '') == '' and - drive.get('path', '') == ''): + drive.get('path', '') == '' and + 'vmPayload' not in drive['specParams']): volPath = '' # ... or load the drive from vmPayload: -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani <from...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches