You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2014/01/22 19:18:13 UTC
git commit: updated refs/heads/master to b5b4607
Updated Branches:
refs/heads/master a9c25dcfa -> b5b4607f7
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5b4607f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5b4607f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5b4607f
Branch: refs/heads/master
Commit: b5b4607f79d70af0d9637fa170f0e853036f7ba2
Parents: a9c25dc
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Jan 22 11:08:34 2014 -0700
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Wed Jan 22 11:17:39 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5b4607f/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 301ff47..8fd542b 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1125,6 +1125,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
VolumeVO volume = _volsDao.findById(volumeId);
disk.setPath(volume.get_iScsiName());
+
+ if (disk.getData() instanceof VolumeObjectTO) {
+ VolumeObjectTO volTo = (VolumeObjectTO)disk.getData();
+
+ volTo.setPath(volume.get_iScsiName());
+ }
+
volume.setPath(volume.get_iScsiName());
_volsDao.update(volumeId, volume);