You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/07/10 12:08:42 UTC

[47/50] git commit: updated refs/heads/CLOUDSTACK-8581 to 1a2e80b

CLOUDSTACK-8324: 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/14d53634
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14d53634
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14d53634

Branch: refs/heads/CLOUDSTACK-8581
Commit: 14d53634a8895f421d260650a4e148556c2dc252
Parents: deb694c
Author: Jayapal <ja...@apache.org>
Authored: Wed Jul 1 14:19:20 2015 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Fri Jul 10 09:47:03 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/14d53634/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);