Merge pull request #327 from ablecloud-team/ablestack-diplo

diplo merge

Author: Dajeong-Park

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -1254,6 +1254,8 @@ protected String validateConfigurationValue(String name, String value, String sc
 
         validateSpecificConfigurationValues(name, value, type);
 
+        validateDisasterRecoveryValues(name, value, type);
+
         boolean isTypeValid = validateValueType(value, type);
         if (!isTypeValid) {
             return String.format("Value [%s] is not a valid [%s].", value, type);
@@ -1415,6 +1417,22 @@ protected void validateSpecificConfigurationValues(String name, String value, Cl
         }
     }
 
+    protected void validateDisasterRecoveryValues(String name, String value, Class<?> type) {
+        if (name.equals("cloud.dr.service.enabled") && value.equals("true")) {
+            boolean rbd = false;
+            List<StoragePoolVO> pools = _storagePoolDao.listAll();
+            for (StoragePoolVO pool : pools) {
+                if (pool.getPoolType() == Storage.StoragePoolType.RBD) {
+                    rbd = true;
+                    break;
+                }
+            }
+            if (!rbd) {
+                throw new InvalidParameterValueException("Disaster recovery service can only be activated if you have rbd type storage.");
+            }
+        }
+    }
+
     protected Pair<Boolean, String> validateCommaSeparatedKeyValueConfigWithPositiveIntegerValues(String value) {
         try {
             if (StringUtils.isNotEmpty(value)) {

ui/src/config/section/compute.js

@@ -1121,4 +1121,3 @@ export default {
     }
   ]
 }
-

ui/src/views/compute/CreateKubernetesCluster.vue

@@ -529,4 +529,3 @@ export default {
     }
   }
 </style>
-