cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4 to 1b1a417
Date Mon, 23 Jun 2014 07:52:56 GMT
CLOUDSTACK-6968: Allowing cluster scope volumes to attach to any VM. If migration is
needed then first they will be migrated to appropriate cluster before attaching.

(cherry picked from commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b1a417b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b1a417b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b1a417b

Branch: refs/heads/4.4
Commit: 1b1a417bb43f507cf920b99b3c0d5ebca97c1724
Parents: 423c23a
Author: Anshul Gangwar <anshul.gangwar@citrix.com>
Authored: Fri Jun 20 16:35:06 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jun 23 09:50:31 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b1a417b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 6703e61..fd434a5 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1944,7 +1944,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
                 }
                 if (storeForDataStoreScope.getScopeId().equals(vmClusterId)) {
                     return false;
-            }
+                } else {
+                    return true;
+                }
             } else if (storeForDataStoreScope.getScopeType() == ScopeType.HOST
                     && (storeForRootStoreScope.getScopeType() == ScopeType.CLUSTER
|| storeForRootStoreScope.getScopeType() == ScopeType.ZONE)) {
                 Long hostId = _vmInstanceDao.findById(rootVolumeOfVm.getInstanceId()).getHostId();


Mime
View raw message