Browse files

Merge "add min size option to ccng resource pool"

  • Loading branch information...
2 parents e609a8e + 0895968 commit 0d0c5e9e928587f6bb52f67eb86c6aa44e8a9562 Patrick Bozeman committed with Gerrit Code Review Jan 29, 2013
View
6 jobs/cloud_controller_ng/spec
@@ -137,6 +137,12 @@ properties:
ccng.default_quota_definition:
default: free
description: "Local to use a local (NFS) file system. AWS to use AWS."
+ ccng.resource_pool.minimum_size:
+ description: "Minimum size of a resource to add to the pool"
+ default: 0
+ ccng.resource_pool.maximum_size:
+ description: "Maximum size of a resource to add to the pool"
+ default: 536870912
ccng.resource_pool.resource_directory_key:
description: "Directory (bucket) used store app resources. It does not have be pre-created."
default: "cc-resources"
View
2 jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
@@ -109,6 +109,8 @@ quota_definitions:
default_quota_definition: <%= p("ccng.default_quota_definition") %>
resource_pool:
+ minimum_size: <%= p("ccng.resource_pool.minimum_size") %>
+ maximum_size: <%= p("ccng.resource_pool.maximum_size") %>
resource_directory_key: <%= p("ccng.resource_pool.resource_directory_key") %>
fog_connection:
<% if_p("ccng.resource_pool.fog_connection.provider") do |provider| %>
2 src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit 3635865ffa3f10cf0eed7c8d49670dd9c4d12b86
+Subproject commit c071e15842a2aaca40a48d8df22cb27491d41377

0 comments on commit 0d0c5e9

Please sign in to comment.