Change in ovirt-engine[ovirt-engine-3.5]: engine: cannot set payload and cloud-init on same devices.

[tnisan at redhat.com]

Tal Nisan has submitted this change and it was merged.

Change subject: engine: cannot set payload and cloud-init on same devices.
......................................................................


engine: cannot set payload and cloud-init on same devices.

On initial run we automatic set cloud-init/sysprep as cdrom/floppy
device - this cause conflict when using the same media.

Change-Id: Ic5b701f058a2d87b2836d337f822d2f012d10bbe
Bug-Url: https://bugzilla.redhat.com/1138314
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
8 files changed, 110 insertions(+), 41 deletions(-)

Approvals:
  Tal Nisan: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/33884
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5b701f058a2d87b2836d337f822d2f012d10bbe
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server