openstack/openstack-manuals
Code Issues Proposed changes

Merge "Adjusted content to consistently use "Load-Balancer-as-a-Service"."

Browse Source
This commit is contained in:
Jenkins 2015-08-15 07:34:13 +00:00 committed by Gerrit Code Review
commit 7aff5ad2d8
7 changed files with 10 additions and 10 deletions

2
doc/admin-guide-cloud-rst/source/networking_multi-dhcp-agents.rst

@ -24,7 +24,7 @@ scalability and HA.
| agent | agent |
| provider | Provider Network |
| router | Neutron L3 Router |
| lbaas | LoadBalancing service |
| lbaas | Load Balancing service |
| extraroute | Neutron Extra Route |
+-----------------+--------------------------+

4
doc/admin-guide-cloud-rst/source/telemetry-measurements.rst

@ -1045,8 +1045,8 @@ The following meters are collected for SDN:
These meters are available for OpenFlow based switches. In order to
enable these meters, each driver needs to be properly configured.
LoadBalancer as a Service (LBaaS)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Load-Balancer-as-a-Service (LBaaS)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following meters are collected for LBaaS:
+---------------+---------+---------+-----------+-----------+-----------------+

4
doc/admin-guide-cloud-rst/source/telemetry-system-architecture.rst

@ -143,13 +143,13 @@ external networking services:
- Firewall-as-a-Service (FWaaS) meters
- Loadbalancer-as-a-Service (LBaaS) meters
- Load-Balancer-as-a-Service (LBaaS) meters
- VPN-as-a-Service (VPNaaS) meters
- SDN controller meters:
- `OpenDaylight <http://www.opendaylight.org/software>`__
- `OpenDaylight <http://www.opendaylight.org/>`__
- `OpenContrail <http://opencontrail.org/>`__

2
doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml

@ -21,7 +21,7 @@
| agent | agent |
| provider | Provider Network |
| router | Neutron L3 Router |
| lbaas | LoadBalancing service |
| lbaas | Load Balancing service |
| extraroute | Neutron Extra Route |
+-----------------+--------------------------+</computeroutput></screen></para>
</note>

2
doc/admin-guide-cloud/telemetry/section_telemetry-measurements.xml

@ -283,7 +283,7 @@
configured.</para>
</section>
<section xml:id="section_telemetry-lbaas-meters">
<title>LoadBalancer as a Service (LBaaS)</title>
<title>Load-Balancer-as-a-Service (LBaaS)</title>
<para>The following meters are collected for LBaaS:</para>
<xi:include href="tables/ceilometer-measurements-lbaas.xml"/>
</section>

4
doc/admin-guide-cloud/telemetry/section_telemetry-system-architecture.xml

@ -202,7 +202,7 @@
<para>Firewall-as-a-Service (FWaaS) meters</para>
</listitem>
<listitem>
<para>Loadbalancer-as-a-Service (LBaaS) meters</para>
<para>Load-Balancer-as-a-Service (LBaaS) meters</para>
</listitem>
<listitem>
<para>VPN-as-a-Service (VPNaaS) meters</para>
@ -214,7 +214,7 @@
<para>SDN controller meters:
<itemizedlist>
<listitem>
<para><link xlink:href="http://www.opendaylight.org/software">
<para><link xlink:href="http://www.opendaylight.org/">
OpenDaylight</link></para>
</listitem>
<listitem>

2
doc/admin-guide-cloud/telemetry/tables/ceilometer-measurements-lbaas.xml

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all" xml:id="ceilometer_measurements_table_lbaas">
<caption>LoadBalancer as a Service meters</caption>
<caption>Load-Balancer-as-a-Service meters</caption>
<col width="37%"/>
<col width="11%"/>
<col width="11%"/>