cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/4.3-forward to 0679af3
Date Wed, 22 Jan 2014 18:11:05 GMT
Updated Branches:
  refs/heads/4.3-forward 78f62c634 -> 0679af343


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

Branch: refs/heads/4.3-forward
Commit: 0679af343453bf888f0ddefdd36937713aacbc28
Parents: 78f62c6
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Wed Jan 22 11:08:34 2014 -0700
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Wed Jan 22 11:08:57 2014 -0700

----------------------------------------------------------------------
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java           | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0679af34/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);


Mime
View raw message