openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Openstack typo"

This commit is contained in:
Jenkins 2015-11-29 07:46:45 +00:00 committed by Gerrit Code Review
parent 7275578a2c 0cecf3ef77
commit 43fbc34cc9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron_lbaas.conf
View File

@ -15,7 +15,7 @@
# Number of pool members allowed per tenant. A negative value means unlimited.
# 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
# on OpenStack. However, on back-end, a member is a resource consumer
# and that is the reason why quota is possible. This is applicable in both
# the v1 and v2 lbaas extensions.
# quota_member = -1
@ -23,7 +23,7 @@
# Number of health monitors allowed per tenant. A negative value means
# unlimited.
# The default is unlimited because a health monitor is not a real resource
# consumer on Openstack. However, on back-end, a health monitor is a resource
# consumer on OpenStack. However, on back-end, a health monitor is a resource
# consumer and that is the reason why quota is possible. This is only
# applicable when using the v1 lbaas extension. The quota for the v2 lbaas
# extension health monitor is quota_healthmonitor.

2
neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy.loadbalancer.j2
View File

@ -1,4 +1,4 @@
{# # Copyright 2014 Openstack Foundation
{# # Copyright 2014 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain

2
neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2
View File

@ -1,4 +1,4 @@
{# # Copyright 2014 Openstack Foundation
{# # Copyright 2014 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain

2
neutron_lbaas/tests/tempest/README.rst
View File

@ -40,7 +40,7 @@ for scenario tests ::
2. Not using Devstack
^^^^^^^^^^^^^^^^^^^^^
6/19/2015 - As we do not have an external Openstack environment with
6/19/2015 - As we do not have an external OpenStack environment with
Neutron_LBaaS V2 to test with, this is TBD
3. Packages tempest vs. tempest-lib