From 0c85faa733aef714a8e47f647a931fb27857d4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89douard=20Thuleau?= Date: Mon, 11 Nov 2013 20:08:44 +0000 Subject: [PATCH] Add missing quota flags in the config file sample l3 extensions don't set quota flags in the config sample file etc/neutron.conf. Quota is unlimited if its value is minus and not only if it's -1. Closes-Bug: #1250574 Change-Id: I76c8d1e2676d4e9b0feeed6e504e759fe736a0db --- etc/neutron.conf | 25 +++++++++++++++++-------- neutron/extensions/firewall.py | 12 ++++++------ neutron/extensions/l3.py | 8 ++++---- neutron/extensions/securitygroup.py | 8 ++++---- neutron/quota.py | 14 +++++++------- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/etc/neutron.conf b/etc/neutron.conf index 83a6dbe23d..a7a83290c7 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -271,28 +271,37 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier # ======== end of WSGI parameters related to the API server ========== [quotas] -# resource name(s) that are supported in quota features +# Resource name(s) that are supported in quota features # quota_items = network,subnet,port -# default number of resource allowed per tenant, minus for unlimited +# Default number of resource allowed per tenant. A negative value means +# unlimited. # default_quota = -1 -# number of networks allowed per tenant, and minus means unlimited +# Number of networks allowed per tenant. A negative value means unlimited. # quota_network = 10 -# number of subnets allowed per tenant, and minus means unlimited +# Number of subnets allowed per tenant. A negative value means unlimited. # quota_subnet = 10 -# number of ports allowed per tenant, and minus means unlimited +# Number of ports allowed per tenant. A negative value means unlimited. # quota_port = 50 -# number of security groups allowed per tenant, and minus means unlimited +# Number of security groups allowed per tenant. A negative value means +# unlimited. # quota_security_group = 10 -# number of security group rules allowed per tenant, and minus means unlimited +# Number of security group rules allowed per tenant. A negative value means +# unlimited. # quota_security_group_rule = 100 -# default driver to use for quota checks +# Number of routers allowed per tenant. A negative value means unlimited. +# quota_router = 10 + +# Number of floating IPs allowed per tenant. A negative value means unlimited. +# quota_floatingip = 50 + +# Default driver to use for quota checks # quota_driver = neutron.db.quota_db.DbQuotaDriver [agent] diff --git a/neutron/extensions/firewall.py b/neutron/extensions/firewall.py index d6e43a5a15..e713e2f7b9 100644 --- a/neutron/extensions/firewall.py +++ b/neutron/extensions/firewall.py @@ -283,16 +283,16 @@ RESOURCE_ATTRIBUTE_MAP = { firewall_quota_opts = [ cfg.IntOpt('quota_firewall', default=1, - help=_('Number of firewalls allowed per tenant, -1 for ' - 'unlimited')), + help=_('Number of firewalls allowed per tenant. ' + 'A negative value means unlimited.')), cfg.IntOpt('quota_firewall_policy', default=1, - help=_('Number of firewall policies allowed per tenant, -1 ' - 'for unlimited')), + help=_('Number of firewall policies allowed per tenant. ' + 'A negative value means unlimited.')), cfg.IntOpt('quota_firewall_rule', default=-1, - help=_('Number of firewall rules allowed per tenant, -1 ' - 'for unlimited')), + help=_('Number of firewall rules allowed per tenant. ' + 'A negative value means unlimited.')), ] cfg.CONF.register_opts(firewall_quota_opts, 'QUOTAS') diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py index 22b9358ce8..4e60222a44 100644 --- a/neutron/extensions/l3.py +++ b/neutron/extensions/l3.py @@ -139,12 +139,12 @@ RESOURCE_ATTRIBUTE_MAP = { l3_quota_opts = [ cfg.IntOpt('quota_router', default=10, - help=_('Number of routers allowed per tenant, -1 for ' - 'unlimited')), + help=_('Number of routers allowed per tenant. ' + 'A negative value means unlimited.')), cfg.IntOpt('quota_floatingip', default=50, - help=_('Number of floating IPs allowed per tenant, ' - '-1 for unlimited')), + help=_('Number of floating IPs allowed per tenant. ' + 'A negative value means unlimited.')), ] cfg.CONF.register_opts(l3_quota_opts, 'QUOTAS') diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index 3fcf15a78f..ad2960facd 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -226,12 +226,12 @@ EXTENDED_ATTRIBUTES_2_0 = { security_group_quota_opts = [ cfg.IntOpt('quota_security_group', default=10, - help=_('Number of security groups allowed per tenant,' - '-1 for unlimited')), + help=_('Number of security groups allowed per tenant. ' + 'A negative value means unlimited.')), cfg.IntOpt('quota_security_group_rule', default=100, - help=_('Number of security rules allowed per tenant, ' - '-1 for unlimited')), + help=_('Number of security rules allowed per tenant. ' + 'A negative value means unlimited.')), ] cfg.CONF.register_opts(security_group_quota_opts, 'QUOTAS') diff --git a/neutron/quota.py b/neutron/quota.py index 411107864d..cee12cf357 100644 --- a/neutron/quota.py +++ b/neutron/quota.py @@ -38,20 +38,20 @@ quota_opts = [ 'features')), cfg.IntOpt('default_quota', default=-1, - help=_('Default number of resource allowed per tenant, ' - 'minus for unlimited')), + help=_('Default number of resource allowed per tenant. ' + 'A negative value means unlimited.')), cfg.IntOpt('quota_network', default=10, - help=_('Number of networks allowed per tenant,' - 'minus for unlimited')), + help=_('Number of networks allowed per tenant.' + 'A negative value means unlimited.')), cfg.IntOpt('quota_subnet', default=10, help=_('Number of subnets allowed per tenant, ' - 'minus for unlimited')), + 'A negative value means unlimited.')), cfg.IntOpt('quota_port', default=50, - help=_('Number of ports allowed per tenant, minus for ' - 'unlimited')), + help=_('Number of ports allowed per tenant. ' + 'A negative value means unlimited.')), cfg.StrOpt('quota_driver', default=QUOTA_DB_DRIVER, help=_('Default driver to use for quota checks')),