From 0cecf3ef7750a35f18f00a939559bd99fa0e8bca Mon Sep 17 00:00:00 2001 From: Shuquan Huang Date: Wed, 25 Nov 2015 11:16:45 +0800 Subject: [PATCH] Openstack typo According to the word choice convention in "http://docs.openstack.org/contributor-guide/writing-style/ word-choice.html" We should use OpenStack instead of Openstack. Change-Id: Ifc68e07b8c8f53e8c9ab982413eb94b3190b067f Closes-bug: #1516634 --- etc/neutron_lbaas.conf | 4 ++-- .../drivers/haproxy/templates/haproxy.loadbalancer.j2 | 2 +- .../loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2 | 2 +- neutron_lbaas/tests/tempest/README.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/neutron_lbaas.conf b/etc/neutron_lbaas.conf index 78da52efc..d083a8565 100644 --- a/etc/neutron_lbaas.conf +++ b/etc/neutron_lbaas.conf @@ -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. diff --git a/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy.loadbalancer.j2 b/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy.loadbalancer.j2 index d3667c860..8957c5226 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy.loadbalancer.j2 +++ b/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy.loadbalancer.j2 @@ -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 diff --git a/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2 b/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2 index b7b19c3a0..932f79043 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2 +++ b/neutron_lbaas/services/loadbalancer/drivers/haproxy/templates/haproxy_proxies.j2 @@ -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 diff --git a/neutron_lbaas/tests/tempest/README.rst b/neutron_lbaas/tests/tempest/README.rst index 96d758bab..6f0059a3c 100644 --- a/neutron_lbaas/tests/tempest/README.rst +++ b/neutron_lbaas/tests/tempest/README.rst @@ -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