Bug 1091044

openshift · May 2, 2014 · f742794 · f742794
1 parent 1f89703
commit f742794
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/broker/config/environments/development.rb b/broker/config/environments/development.rb
@@ -107,7 +107,9 @@
     :app_template_for => OpenShift::Controller::Configuration.parse_url_hash(conf.get('DEFAULT_APP_TEMPLATES', nil)),
     :default_max_teams => (conf.get("DEFAULT_MAX_TEAMS", "0")).to_i,
     :default_view_global_teams => conf.get_bool('DEFAULT_VIEW_GLOBAL_TEAMS', 'false'),
-    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase }
+    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase },
+    :default_max_untracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_UNTRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,
+    :default_max_tracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_TRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,
   }
 
   config.auth = {

diff --git a/broker/config/environments/production.rb b/broker/config/environments/production.rb
@@ -96,7 +96,9 @@
     :app_template_for => OpenShift::Controller::Configuration.parse_url_hash(conf.get('DEFAULT_APP_TEMPLATES', nil)),
     :default_max_teams => (conf.get("DEFAULT_MAX_TEAMS", "0")).to_i,
     :default_view_global_teams => conf.get_bool('DEFAULT_VIEW_GLOBAL_TEAMS', 'false'),
-    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase }    
+    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase },
+    :default_max_untracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_UNTRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,
+    :default_max_tracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_TRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,    
   }
 
   config.auth = {

diff --git a/broker/config/environments/test.rb b/broker/config/environments/test.rb
@@ -105,7 +105,9 @@
     :app_template_for => OpenShift::Controller::Configuration.parse_url_hash(conf.get('DEFAULT_APP_TEMPLATES', nil)),
     :default_max_teams => (conf.get("DEFAULT_MAX_TEAMS", "100")).to_i,
     :default_view_global_teams => conf.get_bool('DEFAULT_VIEW_GLOBAL_TEAMS', 'true'),
-    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase }
+    :node_platforms => OpenShift::Controller::Configuration.parse_list(conf.get('NODE_PLATFORMS', 'linux')).map { |platform| platform.downcase },
+     :default_max_untracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_UNTRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,
+    :default_max_tracked_addtl_storage_per_gear => (conf.get("DEFAULT_MAX_TRACKED_ADDTL_STORAGE_PER_GEAR", "0")).to_i,
   }
 
   config.auth = {

diff --git a/controller/app/models/cloud_user.rb b/controller/app/models/cloud_user.rb
@@ -235,7 +235,9 @@ def default_capabilities
       "max_domains" => Rails.application.config.openshift[:default_max_domains],
       "max_gears" => Rails.application.config.openshift[:default_max_gears],
       "max_teams" => Rails.application.config.openshift[:default_max_teams],
-      "view_global_teams" => Rails.application.config.openshift[:default_view_global_teams]
+      "view_global_teams" => Rails.application.config.openshift[:default_view_global_teams],
+      "max_untracked_addtl_storage_per_gear" =>  Rails.application.config.openshift[:default_max_untracked_addtl_storage_per_gear],
+      "max_tracked_addtl_storage_per_gear" =>  Rails.application.config.openshift[:default_max_tracked_addtl_storage_per_gear],
     }
   end
 
@@ -422,15 +424,15 @@ def max_storage
   end
 
   def max_untracked_additional_storage
-    capabilities['max_untracked_addtl_storage_per_gear'] || 0
+    capabilities['max_untracked_addtl_storage_per_gear'] || Rails.application.config.openshift[:default_max_untracked_addtl_storage_per_gear]
   end
 
   def max_untracked_additional_storage=(m)
     self._capabilities["max_untracked_addtl_storage_per_gear"] = m if capabilities["max_untracked_addtl_storage_per_gear"] != m
   end
 
   def max_tracked_additional_storage
-    capabilities['max_tracked_addtl_storage_per_gear'] || 0
+    capabilities['max_tracked_addtl_storage_per_gear'] || Rails.application.config.openshift[:default_max_tracked_addtl_storage_per_gear]
   end
 
   def max_tracked_additional_storage=(m)