Description of problem: Most capabilities are able to have their defaults set in the broker.conf, but for extra storage capabilities, the default of 0 is not overrideable: From CloudUser: def default_capabilities { "ha" => Rails.application.config.openshift[:default_allow_ha], "subaccounts" => false, "gear_sizes" => Rails.application.config.openshift[:default_gear_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] } end def max_untracked_additional_storage capabilities['max_untracked_addtl_storage_per_gear'] || 0 end def max_tracked_additional_storage capabilities['max_tracked_addtl_storage_per_gear'] || 0 end Version-Release number of selected component (if applicable): How reproducible: Steps to Reproduce: 1. 2. 3. Actual results: Expected results: Additional info:
https://github.com/openshift/origin-server/pull/5365
Commit pushed to master at https://github.com/openshift/li https://github.com/openshift/li/commit/e446ab0aa9fc60a70ea97e38194f5f035b44cd1b Bug 1091044
Commit pushed to master at https://github.com/openshift/origin-server https://github.com/openshift/origin-server/commit/f742794bff9b8d0b70884c15a178328a67815836 Bug 1091044
Tested on devenv_4757 The values have been set as: # Default max untracked additional storage per gear DEFAULT_MAX_UNTRACKED_ADDTL_STORAGE_PER_GEAR="10" # Default max tracked additional storage per gear DEFAULT_MAX_TRACKED_ADDTL_STORAGE_PER_GEAR="8" Clear broker cache and restart btoker, then create a new user and list its capabilities. The result shows that the user still has the default tracked and untracked storage with value 0. [root@ip-10-150-48-51 ~]# oo-admin-ctl-user -l jhou User jhou: plan: free plan quantity: 1 plan expiration date: consumed domains: 0 max domains: 1 consumed gears: 0 max gears: 3 max tracked storage per gear: 0 max untracked storage per gear: 0 max teams: 0 viewing all global teams allowed: false plan upgrade enabled: true gear sizes: small sub accounts allowed: false private SSL certificates allowed: false inherit gear sizes: false HA allowed: false
Verified on devenv_4767. After setting broker-dev.conf, the user has following default capabilities: [root@ip-10-65-156-250 ~]# cat /etc/openshift/broker-dev.conf |grep STORAGE DEFAULT_MAX_UNTRACKED_ADDTL_STORAGE_PER_GEAR="10" DEFAULT_MAX_TRACKED_ADDTL_STORAGE_PER_GEAR="10" [root@ip-10-65-156-250 ~]# oo-admin-ctl-user -l jhou User jhou: plan: free plan quantity: 1 plan expiration date: consumed domains: 1 max domains: 1 consumed gears: 0 max gears: 3 max tracked storage per gear: 10 max untracked storage per gear: 10 max teams: 0 viewing all global teams allowed: false plan upgrade enabled: true gear sizes: small sub accounts allowed: false private SSL certificates allowed: false inherit gear sizes: false HA allowed: false