openstack/openstack-manuals
Code Issues Proposed changes

Merge "[config-ref] update octavia description"

Browse Source
This commit is contained in:
Jenkins 2016-07-26 22:59:18 +00:00 committed by Gerrit Code Review
commit 9b6f87ab31
3 changed files with 6 additions and 4 deletions
doc/config-reference/source
networking
lbaas.rst
tables
neutron-lbaas_services.rst
tools/autogenerate-config-flagmappings
neutron.headers

4
doc/config-reference/source/networking/lbaas.rst

@ -20,7 +20,9 @@ LBaaS agent.
Octavia configuration options Octavia configuration options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options to configure the octavia service. Octavia is an operator-grade open source load balancing solution.
Use the following options in the ``/etc/octavia/octavia.conf`` file
to configure the octavia service.
.. include:: ../tables/octavia-api.rst .. include:: ../tables/octavia-api.rst
.. include:: ../tables/octavia-auth_token.rst .. include:: ../tables/octavia-auth_token.rst

2
doc/config-reference/source/tables/neutron-lbaas_services.rst

@ -10,7 +10,7 @@
.. _neutron-lbaas_services: .. _neutron-lbaas_services:
.. list-table:: Description of LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin configuration options .. list-table:: Description of LBaaS Embrane, Radware, NetScaler, HAproxy, octavia plug-in configuration options
:header-rows: 1 :header-rows: 1
:class: config-ref-table :class: config-ref-table

4
tools/autogenerate-config-flagmappings/neutron.headers

@ -25,8 +25,7 @@ l3_brocade_mlx Brocade MLX L3 plug-in
l3_brocade_mlx_switch Brocade MLX L3 switch l3_brocade_mlx_switch Brocade MLX L3 switch
lbaas Load-Balancer-as-a-Service lbaas Load-Balancer-as-a-Service
lbaas_agent LBaaS agent lbaas_agent LBaaS agent
lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, octavia plug-in
octavia Octavia
linuxbridge_agent Linux Bridge agent linuxbridge_agent Linux Bridge agent
metering_agent metering agent metering_agent metering agent
midonet Midonet midonet Midonet
@ -58,6 +57,7 @@ nova nova
nsx VMware NSX nsx VMware NSX
nuage Nuage nuage Nuage
nvsd NVSD driver nvsd NVSD driver
octavia octavia
onos Open Networking Operating System (ONOS) onos Open Networking Operating System (ONOS)
opencontrail OpenContrail opencontrail OpenContrail
openvswitch_agent Open vSwitch agent openvswitch_agent Open vSwitch agent