From 9a8949a3a54e27f6babfb7c2b203d76f9bd88ff2 Mon Sep 17 00:00:00 2001
From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
Date: Sun, 12 Jan 2014 19:30:20 +0100
Subject: [PATCH] Adds config options to limit image properties and members

This patch adds new options from:
  https://review.openstack.org/#/c/59563/2
  https://review.openstack.org/#/c/56981/8

Change-Id: I808938fa316d084d77fbafb72254d485e1be3e02
Closes-Bug: #1254645
Closes-Bug: #1257528
---
 doc/common/tables/glance-common.xml              | 16 ++++++++++++++--
 .../glance.flagmappings                          |  3 +++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/doc/common/tables/glance-common.xml b/doc/common/tables/glance-common.xml
index 348066380b..0f4d4a4fe0 100644
--- a/doc/common/tables/glance-common.xml
+++ b/doc/common/tables/glance-common.xml
@@ -43,6 +43,18 @@
                        <td>disable_process_locking = False</td>
                        <td>(BoolOpt) Whether to disable inter-process locks</td>
               </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>
                        <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>
@@ -73,7 +85,7 @@
               </tr>
               <tr>
                        <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>
                        <td>user_storage_quota = 0</td>
@@ -85,4 +97,4 @@
               </tr>
        </tbody>
         </table>
-        </para>
\ No newline at end of file
+        </para>
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index 5ba31ed0e0..6c30f4f850 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -44,7 +44,10 @@ image_cache_driver imagecache
 image_cache_max_size imagecache
 image_cache_sqlite_db imagecache
 image_cache_stall_time imagecache
+image_member_quota common
+image_property_quota common
 image_size_cap api
+image_tag_quota common
 instance_format logging
 instance_uuid_format logging
 key_file ssl