CLOUDSTACK-1191: Re-enable deployment of SystemVMs on RBD This was reverted by 0a5228922b822b57af72249912ed854281e1d85a unintentionnaly but broke this feature for RBD.
Enable SystemVM deployment on RBD again (cherry picked from commit 3315159de62620166c119dbf72dad9cf661cc0cb) Signed-off-by: animesh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7678ab4d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7678ab4d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7678ab4d Branch: refs/heads/4.2 Commit: 7678ab4d0da74daa9032cec0a4484fffdde5f098 Parents: fa6da31 Author: Wido den Hollander <[email protected]> Authored: Tue Aug 27 17:03:56 2013 +0200 Committer: animesh <[email protected]> Committed: Tue Aug 27 12:55:29 2013 -0700 ---------------------------------------------------------------------- .../storage/allocator/AbstractStoragePoolAllocator.java | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7678ab4d/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java index 89e0974..e5a1d8b 100755 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -183,14 +183,6 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement return false; } - - DiskOfferingVO diskOffering = _diskOfferingDao.findById(dskCh.getDiskOfferingId()); - if (diskOffering.getSystemUse() && pool.getPoolType() == StoragePoolType.RBD) { - s_logger.debug("Skipping RBD pool " + pool.getName() - + " as a suitable pool. RBD is not supported for System VM's"); - return false; - } - Long clusterId = pool.getClusterId(); ClusterVO cluster = _clusterDao.findById(clusterId); if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
