openstack/charm-neutron-api
Code Issues Proposed changes

fix _ -> -

Browse Source
This commit is contained in:
Seyeong Kim 2015-02-04 03:45:11 +00:00
parent ca3c214bf8
commit 410199fbc6
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config.yaml
View File

@ -67,44 +67,44 @@ options:
vxlan
.
# Quota configuration settings
quota_security_group:
quota-security-group:
default: 10
type: int
description: |
Number of security groups allowed per tenant. A negative value means
unlimited.
quota_security_group_rule:
quota-security-group-rule:
default: 100
type: int
description: |
Number of security group rules allowed per tenant. A negative value means
unlimited
quota_network:
quota-network:
default: 10
type: int
description: |
Number of networks allowed per tenant. A negative value means unlimited.
quota_subnet:
quota-subnet:
default: 10
type: int
description: |
Number of subnets allowed per tenant. A negative value means unlimited.
quota_port:
quota-port:
default: 50
type: int
description: |
Number of ports allowed per tenant. A negative value means unlimited.
quota_vip:
quota-vip:
default: 10
type: int
description: |
Number of vips allowed per tenant. A negative value means unlimited.
quota_pool:
quota-pool:
default: 10
type: int
description: |
Number of pools allowed per tenant. A negative value means unlimited.
quota_member:
quota-member:
default: -1
type: int
description: |
@ -112,7 +112,7 @@ options:
The default is unlimited because a member is not a real resource consumer
on Openstack. However, on back-end, a member is a resource consumer
and that is the reason why quota is possible.
quota_health_monitors:
quota-health-monitors:
default: -1
type: int
description: |
@ -121,12 +121,12 @@ options:
The default is unlimited because a health monitor is not a real resource
consumer on Openstack. However, on back-end, a member is a resource consumer
and that is the reason why quota is possible.
quota_router:
quota-router:
default: 10
type: int
description: |
Number of routers allowed per tenant. A negative value means unlimited.
quota_floatingip:
quota-floatingip:
default: 50
type: int
description: |

22
hooks/neutron_api_context.py
View File

@ -98,18 +98,18 @@ class NeutronCCContext(context.NeutronContext):
ctxt['neutron_bind_port'] = \
determine_api_port(api_port('neutron-server'),
singlenode_mode=True)
ctxt['quota_security_group'] = config('quota_security_group')
ctxt['quota_security_group'] = config('quota-security-group')
ctxt['quota_security_group_rule'] = \
config('quota_security_group_rule')
ctxt['quota_network'] = config('quota_network')
ctxt['quota_subnet'] = config('quota_subnet')
ctxt['quota_port'] = config('quota_port')
ctxt['quota_vip'] = config('quota_vip')
ctxt['quota_pool'] = config('quota_pool')
ctxt['quota_member'] = config('quota_member')
ctxt['quota_health_monitors'] = config('quota_health_monitors')
ctxt['quota_router'] = config('quota_router')
ctxt['quota_floatingip'] = config('quota_floatingip')
config('quota-security-group-rule')
ctxt['quota_network'] = config('quota-network')
ctxt['quota_subnet'] = config('quota-subnet')
ctxt['quota_port'] = config('quota-port')
ctxt['quota_vip'] = config('quota-vip')
ctxt['quota_pool'] = config('quota-pool')
ctxt['quota_member'] = config('quota-member')
ctxt['quota_health_monitors'] = config('quota-health-monitors')
ctxt['quota_router'] = config('quota-router')
ctxt['quota_floatingip'] = config('quota-floatingip')
for rid in relation_ids('neutron-api'):
for unit in related_units(rid):

2
templates/icehouse/neutron.conf
View File

@ -52,7 +52,7 @@ quota_driver = neutron.db.quota_db.DbQuotaDriver
quota_items = network,subnet,port,security_group,security_group_rule
quota_security_group = {{ quota_security_group }}
quota_security_group_rule = {{ quota_security_group_rule }}
{% else %}
{% else -%}
quota_items = network,subnet,port
{% endif -%}
quota_network = {{ quota_network }}