From 11e591e56d7c0ad2468103908f53f30d780d85eb Mon Sep 17 00:00:00 2001 From: qiaomin Date: Thu, 1 Sep 2016 14:17:30 +0000 Subject: [PATCH] Add missing items of "Compute quota descriptions" This patch add the missing items of "Compute quota descriptions", and make consistent with the follow output of "nova quota-defaults" command. Change-Id: I187b213753bfc22ce5cf555230289e1ef3385e0d --- doc/ops-guide/source/ops-quotas.rst | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/ops-guide/source/ops-quotas.rst b/doc/ops-guide/source/ops-quotas.rst index 53409d0c32..6c524c13f0 100644 --- a/doc/ops-guide/source/ops-quotas.rst +++ b/doc/ops-guide/source/ops-quotas.rst @@ -84,12 +84,12 @@ tenant. See :ref:`table_compute_quota`. - Description - Property name * - Fixed IPs - - Number of fixed IP addresses allowed per tenant. + - Number of fixed IP addresses allowed per project. This number must be equal to or greater than the number of allowed instances. - ``fixed-ips`` * - Floating IPs - - Number of floating IP addresses allowed per tenant. + - Number of floating IP addresses allowed per project. - ``floating-ips`` * - Injected file content bytes - Number of content bytes allowed per injected file. @@ -98,10 +98,10 @@ tenant. See :ref:`table_compute_quota`. - Number of bytes allowed per injected file path. - ``injected-file-path-bytes`` * - Injected files - - Number of injected files allowed per tenant. + - Number of injected files allowed per project. - ``injected-files`` * - Instances - - Number of instances allowed per tenant. + - Number of instances allowed per project. - ``instances`` * - Key pairs - Number of key pairs allowed per user. @@ -110,17 +110,23 @@ tenant. See :ref:`table_compute_quota`. - Number of metadata items allowed per instance. - ``metadata-items`` * - RAM - - Megabytes of instance RAM allowed per tenant. + - Megabytes of instance RAM allowed per project. - ``ram`` * - Security group rules - Number of rules per security group. - ``security-group-rules`` * - Security groups - - Number of security groups per tenant. + - Number of security groups per project. - ``security-groups`` * - VCPUs - - Number of instance cores allowed per tenant. + - Number of instance cores allowed per project. - ``cores`` + * - Server Groups + - Number of server groups per project. + - ``server_groups`` + * - Server Group Members + - Number of servers per server group. + - ``server_group_members`` View and update compute quotas for a tenant (project) -----------------------------------------------------