x/vmware-nsx
Code Issues Proposed changes

Add missing quota flags in the config file sample

Browse Source 
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
This commit is contained in:
Édouard Thuleau 2013-11-11 20:08:44 +00:00
parent fbfa21e7ca
commit 0c85faa733
5 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etc/neutron.conf
View File

@ -271,28 +271,37 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# ======== end of WSGI parameters related to the API server ========== # ======== end of WSGI parameters related to the API server ==========
[quotas] [quotas]
# resource name(s) that are supported in quota features # Resource name(s) that are supported in quota features
# quota_items = network,subnet,port # 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 # 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 # 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 # 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 # 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 # 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 # 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 # quota_driver = neutron.db.quota_db.DbQuotaDriver
[agent] [agent]

12
neutron/extensions/firewall.py
View File

@ -283,16 +283,16 @@ RESOURCE_ATTRIBUTE_MAP = {
firewall_quota_opts = [ firewall_quota_opts = [
cfg.IntOpt('quota_firewall', cfg.IntOpt('quota_firewall',
default=1, default=1,
help=_('Number of firewalls allowed per tenant, -1 for ' help=_('Number of firewalls allowed per tenant. '
'unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_firewall_policy', cfg.IntOpt('quota_firewall_policy',
default=1, default=1,
help=_('Number of firewall policies allowed per tenant, -1 ' help=_('Number of firewall policies allowed per tenant. '
'for unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_firewall_rule', cfg.IntOpt('quota_firewall_rule',
default=-1, default=-1,
help=_('Number of firewall rules allowed per tenant, -1 ' help=_('Number of firewall rules allowed per tenant. '
'for unlimited')), 'A negative value means unlimited.')),
] ]
cfg.CONF.register_opts(firewall_quota_opts, 'QUOTAS') cfg.CONF.register_opts(firewall_quota_opts, 'QUOTAS')

8
neutron/extensions/l3.py
View File

@ -139,12 +139,12 @@ RESOURCE_ATTRIBUTE_MAP = {
l3_quota_opts = [ l3_quota_opts = [
cfg.IntOpt('quota_router', cfg.IntOpt('quota_router',
default=10, default=10,
help=_('Number of routers allowed per tenant, -1 for ' help=_('Number of routers allowed per tenant. '
'unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_floatingip', cfg.IntOpt('quota_floatingip',
default=50, default=50,
help=_('Number of floating IPs allowed per tenant, ' help=_('Number of floating IPs allowed per tenant. '
'-1 for unlimited')), 'A negative value means unlimited.')),
] ]
cfg.CONF.register_opts(l3_quota_opts, 'QUOTAS') cfg.CONF.register_opts(l3_quota_opts, 'QUOTAS')

8
neutron/extensions/securitygroup.py
View File

@ -226,12 +226,12 @@ EXTENDED_ATTRIBUTES_2_0 = {
security_group_quota_opts = [ security_group_quota_opts = [
cfg.IntOpt('quota_security_group', cfg.IntOpt('quota_security_group',
default=10, default=10,
help=_('Number of security groups allowed per tenant,' help=_('Number of security groups allowed per tenant. '
'-1 for unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_security_group_rule', cfg.IntOpt('quota_security_group_rule',
default=100, default=100,
help=_('Number of security rules allowed per tenant, ' help=_('Number of security rules allowed per tenant. '
'-1 for unlimited')), 'A negative value means unlimited.')),
] ]
cfg.CONF.register_opts(security_group_quota_opts, 'QUOTAS') cfg.CONF.register_opts(security_group_quota_opts, 'QUOTAS')

14
neutron/quota.py
View File

@ -38,20 +38,20 @@ quota_opts = [
'features')), 'features')),
cfg.IntOpt('default_quota', cfg.IntOpt('default_quota',
default=-1, default=-1,
help=_('Default number of resource allowed per tenant, ' help=_('Default number of resource allowed per tenant. '
'minus for unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_network', cfg.IntOpt('quota_network',
default=10, default=10,
help=_('Number of networks allowed per tenant,' help=_('Number of networks allowed per tenant.'
'minus for unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_subnet', cfg.IntOpt('quota_subnet',
default=10, default=10,
help=_('Number of subnets allowed per tenant, ' help=_('Number of subnets allowed per tenant, '
'minus for unlimited')), 'A negative value means unlimited.')),
cfg.IntOpt('quota_port', cfg.IntOpt('quota_port',
default=50, default=50,
help=_('Number of ports allowed per tenant, minus for ' help=_('Number of ports allowed per tenant. '
'unlimited')), 'A negative value means unlimited.')),
cfg.StrOpt('quota_driver', cfg.StrOpt('quota_driver',
default=QUOTA_DB_DRIVER, default=QUOTA_DB_DRIVER,
help=_('Default driver to use for quota checks')), help=_('Default driver to use for quota checks')),