From 14d53634a8895f421d260650a4e148556c2dc252 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Wed, 1 Jul 2015 14:19:20 +0530 Subject: [PATCH] CLOUDSTACK-8324: Removed using config drive label from the uservmservice --- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 41143866ee2..c61f13fc1da 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);