You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2013/12/11 20:43:44 UTC
git commit: updated refs/heads/4.3 to 2dfa84b
Updated Branches:
refs/heads/4.3 4907a8f6f -> 2dfa84bf2
CLOUDSTACK-5468: Configuration property should be optional
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2dfa84bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2dfa84bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2dfa84bf
Branch: refs/heads/4.3
Commit: 2dfa84bf2bd20adfdb5eecbdbca4d1182ab3fd2a
Parents: 4907a8f
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Wed Dec 11 12:43:01 2013 -0700
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Wed Dec 11 12:43:01 2013 -0700
----------------------------------------------------------------------
.../SolidFirePrimaryDataStoreLifeCycle.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2dfa84bf/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
index be43e1c..fca75d3 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
@@ -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);