etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5468: Configuration property should be optional

This commit is contained in:
Mike Tutkowski 2013-12-11 12:43:01 -07:00
parent 4907a8f6fa
commit 2dfa84bf2b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
View File

@ -168,13 +168,19 @@ public class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC
details.put(SolidFireUtil.CLUSTER_DEFAULT_MAX_IOPS, String.valueOf(lClusterDefaultMaxIops));
details.put(SolidFireUtil.CLUSTER_DEFAULT_BURST_IOPS_PERCENT_OF_MAX_IOPS, String.valueOf(fClusterDefaultBurstIopsPercentOfMaxIops));
String useMutualChapForVMware = getValue(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, url);
String useMutualChapForVMware = Boolean.TRUE.toString();
if (useMutualChapForVMware == null || new Boolean(useMutualChapForVMware)) {
useMutualChapForVMware = Boolean.TRUE.toString();
try {
useMutualChapForVMware = getValue(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, url);
if (useMutualChapForVMware == null || new Boolean(useMutualChapForVMware)) {
useMutualChapForVMware = Boolean.TRUE.toString();
}
else {
useMutualChapForVMware = Boolean.FALSE.toString();
}
}
else {
useMutualChapForVMware = Boolean.FALSE.toString();
catch (Exception ex) {
}
details.put(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, useMutualChapForVMware);