From b3f18e7d74a0f09db9977554a6c7648b7edbc33d Mon Sep 17 00:00:00 2001
From: wrodrigues <wrodrigues@schubergphilis.com>
Date: Tue, 8 Apr 2014 13:54:54 +0200
Subject: [PATCH] implementation of the featured requests in the issue
 CLOUDSTACK-6139.

Signed-off-by: Daan Hoogland <daan@onecht.net>
---
 .../src/com/cloud/configuration/Config.java   |  2 +-
 .../deploy/DeploymentPlanningManagerImpl.java | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 682719712ba..e3be2815086 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -702,7 +702,7 @@ public enum Config {
             "system.vm.use.local.storage",
             "false",
             "Indicates whether to use local storage pools or shared storage pools for system VMs.",
-            null),
+            null, ConfigKey.Scope.Zone.toString()),
     SystemVMAutoReserveCapacity(
             "Advanced",
             ManagementServer.class,
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 5e6ab49186c..db6fa5fee83 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -198,6 +198,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
     @Inject
     protected StoragePoolHostDao _poolHostDao;
 
+    @Inject
+    protected DataCenterDao _zoneDao;
     @Inject
     protected VolumeDao _volsDao;
     @Inject
@@ -1259,7 +1261,18 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
             boolean useLocalStorage = false;
             if (vmProfile.getType() != VirtualMachine.Type.User) {
                 String ssvmUseLocalStorage = _configDao.getValue(Config.SystemVMUseLocalStorage.key());
-                if (ssvmUseLocalStorage.equalsIgnoreCase("true")) {
+
+                DataCenterVO zone = _zoneDao.findById(plan.getDataCenterId());
+
+                // It should not happen to have a "null" zone here. There can be NO instance if there is NO zone,
+                // so this part of the code would never be reached if no zone has been created.
+                //
+                // Added the check and the comment just to make it clear.
+                boolean zoneUsesLocalStorage = zone != null ? zone.isLocalStorageEnabled() : false;
+
+                // Local storage is used for the NON User VMs if, and only if, the Zone is marked to use local storage AND
+                // the global settings (ssvmUseLocalStorage) is set to true. Otherwise, the global settings won't be applied.
+                if (ssvmUseLocalStorage.equalsIgnoreCase("true") && zoneUsesLocalStorage) {
                     useLocalStorage = true;
                 }
             } else {
@@ -1270,11 +1283,12 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
                 // when deploying VM based on ISO, we have a service offering
                 // and an additional disk offering, use-local storage flag is
                 // actually
-                // saved in service offering, overrde the flag from service
+                // saved in service offering, override the flag from service
                 // offering when it is a ROOT disk
                 if (!useLocalStorage && vmProfile.getServiceOffering().getUseLocalStorage()) {
-                    if (toBeCreated.getVolumeType() == Volume.Type.ROOT)
+                    if (toBeCreated.getVolumeType() == Volume.Type.ROOT) {
                         useLocalStorage = true;
+                    }
                 }
             }
             diskProfile.setUseLocalStorage(useLocalStorage);