From 1f80cdd0b219ea0ef4ff6128c7afc58fa4846c1d Mon Sep 17 00:00:00 2001
From: lane <lane.l@inwinstack.com>
Date: Wed, 17 Jun 2015 17:40:28 +0800
Subject: [PATCH] Add lbaas configuration opt in config-reference

neutron-lbaas has now its own repository and the configuration options have
moved in different files. This should be reflected in the admin-cloud-guide
and the configuration reference.

Change-Id: Id3c3e0c85b214114d5c98000bc5d7916c5d65b49
Closes-Bug: #1449847
---
 doc/common/tables/neutron-lbaas_agent.xml     | 45 +++++++++++++++++++
 .../networking/section_networking-plugins.xml |  8 ++++
 2 files changed, 53 insertions(+)
 create mode 100644 doc/common/tables/neutron-lbaas_agent.xml

diff --git a/doc/common/tables/neutron-lbaas_agent.xml b/doc/common/tables/neutron-lbaas_agent.xml
new file mode 100644
index 0000000000..0c71d7cd3d
--- /dev/null
+++ b/doc/common/tables/neutron-lbaas_agent.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_neutron_lbaas_agent">
+    <caption>Description of Load-Balancer-as-a-Service agent configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[DEFAULT]</th>
+      </tr>
+      <tr>
+        <td><option>periodic_interval</option> = <replaceable>10</replaceable></td>
+        <td>(IntOpt) Seconds between periodic task runs.</td>
+      </tr>
+      <tr>
+        <td><option>Variable</option> = <replaceable>neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver</replaceable></td>
+        <td>(MultiStrOpt) Drivers used to manage loadbalancing devices.</td>
+      </tr>
+      <tr>
+        <th colspan="2">[haproxy]</th>
+      </tr>
+      <tr>
+        <td><option>loadbalancer_state_path</option> = <replaceable>$state_path/lbaas</replaceable></td>
+        <td>(StrOpt) Location to store config and state files.</td>
+      </tr>
+      <tr>
+        <td><option>user_group</option> = <replaceable>nogroup</replaceable></td>
+        <td>(StrOpt) The user group.</td>
+      </tr>
+      <tr>
+        <td><option>Variable</option> = <replaceable>3</replaceable></td>
+        <td>(IntOpt) When delete and re-add the same vip, send this many gratuitous ARPs to flush the ARP cache in the Router. Set it below or equal to 0 to disable this feature.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index 7b2e290cce..f596d2a098 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -161,4 +161,12 @@
                            href="../../common/tables/neutron-nsx.xml"
                   />
          </section>
+         <section xml:id="networking-plugin-lbaas">
+                  <title>Load-Balancer-as-a-Service Agent configuration options</title>
+                    <para>Use the following options in the <filename>lbaas_agent.ini</filename>
+                          file for the LBaaS agent.</para>
+                  <xi:include
+                           href="../../common/tables/neutron-lbaas_agent.xml"
+                  />
+         </section>
 </section>