Shahar Havivi has posted comments on this change. Change subject: engine: cannot set payload and cloud-init on same devices. ......................................................................
Patch Set 9: (2 comments) http://gerrit.ovirt.org/#/c/33318/9/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java: Line 693: } Line 694: } Line 695: // if we asked for floppy from Iso Domain we cannot Line 696: // have floppy payload since we are limited to only one floppy device Line 697: if (!StringUtils.isEmpty(getParameters().getFloppyPath()) && isPayloadExists(VmDeviceType.FLOPPY)) { > are you sure that this is not set when requesting sysprep in runonce ? Yes, double checked... Line 698: getVm().setVmPayload(null); Line 699: } Line 700: Line 701: // get what cpu flags should be passed to vdsm according to cluster http://gerrit.ovirt.org/#/c/33318/9/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java: Line 132: Map<String, Object> struct; Line 133: boolean hasPayload = vm.getVmPayload() != null && vm.getVmPayload().getDeviceType() == VmDeviceType.CDROM; Line 134: // check if we have payload CD Line 135: if (hasPayload) { Line 136: VmDevice vmDevice = > no need to create new vmDevice, you need to use the vmPayload object, which True, (In build floppy as well...) Line 137: new VmDevice(new VmDeviceId(Guid.newGuid(), vm.getId()), Line 138: VmDeviceGeneralType.DISK, Line 139: VmDeviceType.CDROM.getName(), Line 140: "", -- To view, visit http://gerrit.ovirt.org/33318 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic5b701f058a2d87b2836d337f822d2f012d10bbe Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skriva...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Shahar Havivi <shav...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
