You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/01/22 22:17:48 UTC
[3/4] git commit: updated refs/heads/4.3 to aa6f4dc
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
(cherry picked from commit 0679af343453bf888f0ddefdd36937713aacbc28)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7125ac73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7125ac73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7125ac73
Branch: refs/heads/4.3
Commit: 7125ac738225bb9b1a2ea31a4161376b107b2647
Parents: c14941e
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Jan 22 11:08:34 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Jan 22 13:07:16 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7125ac73/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 df51a3c..6dc5894 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1121,6 +1121,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);