From d94291bc4653941dc7e5217d7f51110c039f7592 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Wed, 2 Apr 2014 15:16:08 -0500
Subject: [PATCH] Add LBaaS extension terms to glossary

Change-Id: Ic57735a0282690b4b394c8ea41bfa76fa4a88c16
author: diane fleming
---
 doc/glossary/glossary-terms.xml     | 60 ++++++++++++++++++++++++++---
 doc/glossary/openstack-glossary.xml | 35 ++++++++---------
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 49776e07fa..10ac0370a1 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -634,6 +634,14 @@
             </para>
           </glossdef>
         </glossentry>
+        <glossentry>
+            <glossterm>Block Storage API</glossterm>
+            <glossdef>
+                <para>An API on a separate endpoint for attaching,
+                    detaching, and creating block storage for compute
+                    VMs.</para>
+            </glossdef>
+        </glossentry>
         <glossentry>
             <glossterm>BMC</glossterm>
             <glossdef>
@@ -2067,7 +2075,7 @@
             </glossdef>
         </glossentry>
         <glossentry>
-            <glossterm>frontend</glossterm>
+            <glossterm>front end</glossterm>
             <glossdef>
                 <para>The point where a user interacts with a service;
                     can be an API endpoint, the horizon dashboard, or
@@ -2216,6 +2224,18 @@
                     OpenStack.</para>
             </glossdef>
         </glossentry>
+        <glossentry>
+            <glossterm>health monitor</glossterm>
+            <glossdef>
+                <para>Determines whether back-end members of a VIP
+                    pool can process a request. A pool can have
+                    several health monitors associated with it. When a
+                    pool has several monitors associated with it, all
+                    monitors check each member of the pool. All
+                    monitors must declare a member to be healthy for
+                    it to stay active.</para>
+            </glossdef>
+        </glossentry>
         <glossentry>
             <glossterm>horizon</glossterm>
             <glossdef>
@@ -3531,6 +3551,24 @@
                 </para>
             </glossdef>
         </glossentry>
+        <glossentry>
+            <glossterm>pool</glossterm>
+            <glossdef>
+                <para>A logical set of devices, such as web servers,
+                    that you group together to receive and process
+                    traffic. The load balancing function chooses which
+                    member of the pool handles the new requests or
+                    connections received on the VIP address. Each VIP
+                    has one pool.</para>
+            </glossdef>
+        </glossentry>
+        <glossentry>
+            <glossterm>pool member</glossterm>
+            <glossdef>
+                <para>An application that runs on the back-end server
+                    in a load-balancing system.</para>
+            </glossdef>
+        </glossentry>
         <glossentry>
             <glossterm>port</glossterm>
             <glossdef>
@@ -4780,6 +4818,20 @@
                 <para>Unique ID assigned to each Networking VIF.</para>
             </glossdef>
         </glossentry>
+        <glossentry>
+            <glossterm>VIP</glossterm>
+            <glossdef>
+                <para>The primary load balancing configuration object.
+                    Specifies the virtual IP address and port where
+                    client traffic is received. Also defines other
+                    details such as the load balancing method to be
+                    used, protocol, and so on. This entity is
+                    sometimes known in load-balancing products as a
+                        virtual server,
+                        vserver, or
+                        listener.</para>
+            </glossdef>
+        </glossentry>
         <glossentry>
             <glossterm>Virtual Central Processing Unit
                 (vCPU)</glossterm>
@@ -4968,9 +5020,7 @@
         <glossentry>
             <glossterm>Volume API</glossterm>
             <glossdef>
-                <para>An API on a separate endpoint for attaching,
-                    detaching, and creating block storage for compute
-                    VMs.</para>
+                <para>Alternative name for the Block Storage API.</para>
             </glossdef>
         </glossentry>
         <glossentry>
@@ -5142,4 +5192,4 @@
         </glossentry>
     </glossdiv>
     <!-- ... -->
-</glossary>
+</glossary>
\ No newline at end of file
diff --git a/doc/glossary/openstack-glossary.xml b/doc/glossary/openstack-glossary.xml
index 927c6cdb0c..936f97f738 100644
--- a/doc/glossary/openstack-glossary.xml
+++ b/doc/glossary/openstack-glossary.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <book xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:svg="http://www.w3.org/2000/svg"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    version="5.0"
-    xml:id="openstack-glossary">
-    <title>OpenStack Glossary</title>
-    <!-- <?dbhtml stop-chunking?> -->
-        <chapter xml:id="glossary">
-          <title>OpenStack Glossary</title>
-          <para>Use this glossary to get definitions of OpenStack-related
-            words and phrases.</para>
-        <para>To add to this glossary, fork the
-                <literal>openstack-manuals</literal> repository on
-            github.com and update the source files through the
-            OpenStack contribution process.</para>
-          <xi:include href="glossary-terms.xml"/>
-        </chapter>
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:html="http://www.w3.org/1999/xhtml" version="5.0"
+  xml:id="openstack-glossary">
+  <title>OpenStack glossary</title>
+  <!-- <?dbhtml stop-chunking?> -->
+  <chapter xml:id="glossary">
+    <title>OpenStack glossary</title>
+    <para>Use this glossary to get definitions of OpenStack-related
+      words and phrases.</para>
+    <para>To add to this glossary, fork the
+        <literal>openstack-manuals</literal> repository on github.com
+      and update the source files through the OpenStack contribution
+      process.</para>
+    <xi:include href="glossary-terms.xml"/>
+  </chapter>
 </book>