Skip to content

Commit 14d5363

Browse files
author
Jayapal
committed
CLOUDSTACK-8324: Removed using config drive label from the uservmservice
1 parent deb694c commit 14d5363

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ public void setHostAllocators(final List<HostAllocator> hostAllocators) {
324324
protected VmWorkJobDao _workJobDao;
325325
@Inject
326326
protected AsyncJobManager _jobMgr;
327-
@Inject
328-
protected UserVmService _userVmSrv;
329327

330328
VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
331329

@@ -1930,7 +1928,7 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
19301928
final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
19311929
_networkMgr.prepareNicForMigration(profile, dest);
19321930
volumeMgr.prepareForMigration(profile, dest);
1933-
profile.setConfigDriveLabel( _userVmSrv.VmConfigDriveLabel.value());
1931+
profile.setConfigDriveLabel(VmConfigDriveLabel.value());
19341932

19351933
final VirtualMachineTO to = toVmTO(profile);
19361934
final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);

0 commit comments

Comments
 (0)