[cloudstack] branch master updated: Fix iops values when creating a compute offering (#3345)

[dkonrad]

This is an automated email from the ASF dual-hosted git repository.

dkonrad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 62c8a11  Fix iops values when creating a compute offering (#3345)
62c8a11 is described below

commit 62c8a1110cbb06c4b337d5b024c3042971502e75
Author: Philipp Bankonier <p.bankon...@ewerk.com>
AuthorDate: Thu May 23 13:25:49 2019 +0200

    Fix iops values when creating a compute offering (#3345)
    
    @mike-tutkowski @syed If there's something more that needs to be 
added/changed, we'll just open another PR for this.
    
    For now this seems to be a very straightforward fix for the UI problem with 
managed storage.
    
    * Fix iops values when creating a compute offering
    * Fix iops values when creating a disk offering
---
 .../main/java/com/cloud/configuration/ConfigurationManagerImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index a104bfb..cebc9e1 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2411,7 +2411,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
                 limitResourceUse, volatileVm, displayText, 
typedProvisioningType, localStorageRequired, false, tags, isSystem, vmType,
                 domainId, hostTag, deploymentPlanner);
 
-        if (Boolean.TRUE.equals(isCustomizedIops)) {
+        if (Boolean.TRUE.equals(isCustomizedIops) || isCustomizedIops == null) 
{
                 minIops = null;
                 maxIops = null;
         } else {
@@ -2632,7 +2632,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
             isCustomized = true;
         }
 
-        if (Boolean.TRUE.equals(isCustomizedIops)) {
+        if (Boolean.TRUE.equals(isCustomizedIops) || isCustomizedIops == null) 
{
             minIops = null;
             maxIops = null;
         } else {