Merge "Adds config options to limit image properties and members"

This commit is contained in:
Jenkins 2014-01-13 14:39:23 +00:00 committed by Gerrit Code Review
commit 3515e3e1b6
2 changed files with 17 additions and 2 deletions

View File

@ -43,6 +43,18 @@
<td>disable_process_locking = False</td> <td>disable_process_locking = False</td>
<td>(BoolOpt) Whether to disable inter-process locks</td> <td>(BoolOpt) Whether to disable inter-process locks</td>
</tr> </tr>
<tr>
<td>image_member_quota = 128</td>
<td>(IntOpt) Maximum number of image members per image. Negative values evaluate to unlimited.</td>
</tr>
<tr>
<td>image_property_quota = 128</td>
<td>(IntOpt) Maximum number of properties allowed on an image. Negative values evaluate to unlimited.</td>
</tr>
<tr>
<td>image_tag_quota = 128</td>
<td>(IntOpt) Maximum number of tags allowed on an image. Negative values evaluate to unlimited.</td>
</tr>
<tr> <tr>
<td>limit_param_default = 25</td> <td>limit_param_default = 25</td>
<td>(IntOpt) Default value for the number of items returned by a request if not specified explicitly in the request</td> <td>(IntOpt) Default value for the number of items returned by a request if not specified explicitly in the request</td>
@ -73,7 +85,7 @@
</tr> </tr>
<tr> <tr>
<td>use_tpool = False</td> <td>use_tpool = False</td>
<td>(BoolOpt) Enable the use of thread pooling for all DB API calls</td> <td>(BoolOpt) Enable the experimental use of thread pooling for all DB API calls</td>
</tr> </tr>
<tr> <tr>
<td>user_storage_quota = 0</td> <td>user_storage_quota = 0</td>
@ -85,4 +97,4 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</para> </para>

View File

@ -44,7 +44,10 @@ image_cache_driver imagecache
image_cache_max_size imagecache image_cache_max_size imagecache
image_cache_sqlite_db imagecache image_cache_sqlite_db imagecache
image_cache_stall_time imagecache image_cache_stall_time imagecache
image_member_quota common
image_property_quota common
image_size_cap api image_size_cap api
image_tag_quota common
instance_format logging instance_format logging
instance_uuid_format logging instance_uuid_format logging
key_file ssl key_file ssl