Repository: cloudstack Updated Branches: refs/heads/dhcpoffload 45721aed5 -> 197f0cb99
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/197f0cb9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/197f0cb9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/197f0cb9 Branch: refs/heads/dhcpoffload Commit: 197f0cb99e9e24684d644ae39ce62690b859b25f Parents: 45721ae Author: Jayapal <[email protected]> Authored: Wed Jul 1 14:19:20 2015 +0530 Committer: Jayapal <[email protected]> Committed: Wed Jul 1 16:28:54 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/197f0cb9/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);
