openstack
/
openstack-manuals
Code Issues Proposed changes

Merge "[config-ref] reorganize Networking XX-as-a-Service"

This commit is contained in:
Jenkins 2016-06-16 05:45:12 +00:00 committed by Gerrit Code Review
parent a2422f1994 2aec2e543c
commit 4062ad769e
5 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/config-reference/source/networking.rst
View File

@ -5,6 +5,9 @@ Networking service
.. toctree::
networking/networking_options_reference.rst
networking/fwaas.rst
networking/lbaas.rst
networking/vpnaas.rst
networking/logs.rst
networking/sample-configuration-files.rst
networking/sample-configuration-files-advanced.rst

10
doc/config-reference/source/networking/fwaas.rst Normal file
View File

@ -0,0 +1,10 @@
===========================================
Firewall-as-a-Service configuration options
===========================================
Use the following options in the ``fwaas_driver.ini``
file for the FWaaS driver.
.. include:: ../tables/neutron-fwaas.rst
.. include:: ../tables/neutron-fwaas_ngfw.rst
.. include:: ../tables/neutron-fwaas_varmour.rst

35
doc/config-reference/source/networking/lbaas.rst Normal file
View File

@ -0,0 +1,35 @@
================================================
Load-Balancer-as-a-Service configuration options
================================================
Use the following options in the ``neutron_lbaas.conf`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas.rst
Use the following options in the ``lbaas_agent.ini`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas_agent.rst
Use the following options in the ``services_lbaas.conf`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas_services.rst
Octavia configuration options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options to configure the octavia service.
.. include:: ../tables/octavia-api.rst
.. include:: ../tables/octavia-auth_token.rst
.. include:: ../tables/octavia-cache.rst
.. include:: ../tables/octavia-common.rst
.. include:: ../tables/octavia-cors.rst
.. include:: ../tables/octavia-database.rst
.. include:: ../tables/octavia-logging.rst
.. include:: ../tables/octavia-rabbitmq.rst
.. include:: ../tables/octavia-redis.rst
.. include:: ../tables/octavia-rpc.rst
.. include:: ../tables/octavia-zeromq.rst

80
doc/config-reference/source/networking/networking_options_reference.rst
View File

@ -208,69 +208,6 @@ Use the following options to alter DVR-related settings.
.. include:: ../tables/neutron-dvr.rst
Firewall-as-a-Service driver
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options in the ``fwaas_driver.ini``
file for the FWaaS driver.
.. include:: ../tables/neutron-fwaas.rst
.. include:: ../tables/neutron-fwaas_ngfw.rst
.. include:: ../tables/neutron-fwaas_varmour.rst
Load-Balancer-as-a-Service configuration options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options in the ``neutron_lbaas.conf`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas.rst
Use the following options in the ``lbaas_agent.ini`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas_agent.rst
Use the following options in the ``services_lbaas.conf`` file for the
LBaaS agent.
.. include:: ../tables/neutron-lbaas_services.rst
VPN-as-a-Service configuration options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options in the ``vpnaas_agent.ini`` file for the
VPNaaS agent.
.. include:: ../tables/neutron-vpnaas.rst
.. include:: ../tables/neutron-vpnaas_ipsec.rst
.. include:: ../tables/neutron-vpnaas_openswan.rst
.. include:: ../tables/neutron-vpnaas_strongswan.rst
.. note::
``strongSwan`` and ``Openswan`` cannot both be installed and enabled at the
same time. The ``vpn_device_driver`` configuration option in the
``vpnaas_agent.ini`` file is an option that lists the VPN device
drivers that the Networking service will use. You must choose either
``strongSwan`` or ``Openswan`` as part of the list.
.. important::
Ensure that your ``strongSwan`` version is 5 or newer.
To declare either one in the ``vpn_device_driver``:
.. code-block:: ini
#Openswan
vpn_device_driver = ['neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver']
#strongSwan
vpn_device_driver = ['neutron.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver']
IPv6 router advertisement
~~~~~~~~~~~~~~~~~~~~~~~~~
@ -286,23 +223,6 @@ agent.
.. include:: ../tables/neutron-l3_agent.rst
Load Balancing service (octavia)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use the following options to configure the octavia service:
.. include:: ../tables/octavia-api.rst
.. include:: ../tables/octavia-auth_token.rst
.. include:: ../tables/octavia-cache.rst
.. include:: ../tables/octavia-common.rst
.. include:: ../tables/octavia-cors.rst
.. include:: ../tables/octavia-database.rst
.. include:: ../tables/octavia-logging.rst
.. include:: ../tables/octavia-rabbitmq.rst
.. include:: ../tables/octavia-redis.rst
.. include:: ../tables/octavia-rpc.rst
.. include:: ../tables/octavia-zeromq.rst
Logging
~~~~~~~

33
doc/config-reference/source/networking/vpnaas.rst Normal file
View File

@ -0,0 +1,33 @@
======================================
VPN-as-a-Service configuration options
======================================
Use the following options in the ``vpnaas_agent.ini`` file for the
VPNaaS agent.
.. include:: ../tables/neutron-vpnaas.rst
.. include:: ../tables/neutron-vpnaas_ipsec.rst
.. include:: ../tables/neutron-vpnaas_openswan.rst
.. include:: ../tables/neutron-vpnaas_strongswan.rst
.. note::
``strongSwan`` and ``Openswan`` cannot both be installed and enabled at the
same time. The ``vpn_device_driver`` configuration option in the
``vpnaas_agent.ini`` file is an option that lists the VPN device
drivers that the Networking service will use. You must choose either
``strongSwan`` or ``Openswan`` as part of the list.
.. important::
Ensure that your ``strongSwan`` version is 5 or newer.
To declare either one in the ``vpn_device_driver``:
.. code-block:: ini
#Openswan
vpn_device_driver = ['neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver']
#strongSwan
vpn_device_driver = ['neutron.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver']