Removed using config drive label from the uservmservice
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56f2b9c0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56f2b9c0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56f2b9c0 Branch: refs/heads/dhcpnew Commit: 56f2b9c0b54afe95333612b52e0ea994bae8782d Parents: 638885a Author: Jayapal <jaya...@apache.org> Authored: Wed Jul 1 14:19:20 2015 +0530 Committer: Jayapal <jaya...@apache.org> Committed: Wed Jul 8 15:13:02 2015 +0530 ---------------------------------------------------------------------- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56f2b9c0/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 4114386..c61f13f 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -324,8 +324,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac protected VmWorkJobDao _workJobDao; @Inject protected AsyncJobManager _jobMgr; - @Inject - protected UserVmService _userVmSrv; VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this); @@ -1930,7 +1928,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null); _networkMgr.prepareNicForMigration(profile, dest); volumeMgr.prepareForMigration(profile, dest); - profile.setConfigDriveLabel( _userVmSrv.VmConfigDriveLabel.value()); + profile.setConfigDriveLabel(VmConfigDriveLabel.value()); final VirtualMachineTO to = toVmTO(profile); final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
