Merge "Joining documentation of network services in one file"

doc/source/install-guide/configure-fwaas.rst

@@ -1,57 +0,0 @@
-`Home <index.html>`_ OpenStack-Ansible Installation Guide
-
-Configuring the Network Firewall Service (Optional)
----------------------------------------------------
-
-The OpenStack Networking Service, Neutron, includes a Firewall as a
-Service (FWaaS) offering. This service lets you configure a firewall that
-runs outside of your instances and filters traffic from the router.
-
-The following procedure describes how to modify the
-``/etc/openstack_deploy/user_variables.yml`` file to enable FWaaS.
-
-#. Override the default list of Neutron plugins to include
-   ``firewall``:
-
-   .. code-block:: yaml
-
-      neutron_plugin_base:
-        - firewall
-        - ...
-
-#. The complete `neutron_plugin_base`, at the time of this writing, is as follows:
-
-   .. code-block:: yaml
-
-      neutron_plugin_base:
-         - router
-         - firewall
-         - lbaas
-         - vpnaas
-         - metering
-         - qos
-
-#. Execute the Neutron install playbook in order to update the configuration:
-
-   .. code-block:: shell-session
-
-       # cd /opt/openstack-ansible/playbooks
-       # openstack-ansible os-neutron-install.yml
-
-#. Execute the Horizon install playbook in order to update the Horizon
-   configuration to show the FWaaS panels:
-
-   .. code-block:: shell-session
-
-       # cd /opt/openstack-ansible/playbooks
-       # openstack-ansible os-horizon-install.yml
-
-The FWaaS default configuration options may be changed through the
-`conf override`_ mechanism using the ``neutron_neutron_conf_overrides``
-dict.
-
-.. _conf override: http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-openstack.html
-
---------------
-
-.. include:: navigation.txt

doc/source/install-guide/configure-network-services.rst

@@ -1,13 +1,61 @@
 `Home <index.html>`_ OpenStack-Ansible Installation Guide
 
-Configuring the Network Load Balancing Service (Optional)
+Configuring the Network Services (Optional)
----------------------------------------------------------
+---------------------------------------------------
 
-The OpenStack Networking Service, Neutron, includes a Load Balancer as a
+The OpenStack Networking Service, Neutron, includes the following services:
-Service (LBaaS). This service lets you configure a load balancer that runs
+ - Firewall as a Service (FWaaS) allows for the configuration of a firewall that filters traffic from the router.
-outside of your instances and directs traffic to your instances. A common use
+ - Load Balancer as a Service (LBaaS) allows for the configuration of a load balancer that directs traffic to the specified instances.
-case is when you want to use multiple instances to serve web pages and want to
+ - VPN as a Service (VPNaaS) allows for the configuration of a virtual private network allowing the extension of the private network across a public network.
-meet high performance or availability goals.
+
+Firewall Service (Optional)
+---------------------------------------------------
+
+The following procedure describes how to modify the
+``/etc/openstack_deploy/user_variables.yml`` file to enable FWaaS.
+
+#. Override the default list of Neutron plugins to include
+   ``firewall``:
+
+   .. code-block:: yaml
+
+      neutron_plugin_base:
+        - firewall
+        - ...
+
+#. The complete `neutron_plugin_base`, at the time of this writing, is as follows:
+
+   .. code-block:: yaml
+
+      neutron_plugin_base:
+         - router
+         - firewall
+         - lbaas
+         - vpnaas
+         - metering
+         - qos
+
+#. Execute the Neutron install playbook in order to update the configuration:
+
+   .. code-block:: shell-session
+
+       # cd /opt/openstack-ansible/playbooks
+       # openstack-ansible os-neutron-install.yml
+
+#. Execute the Horizon install playbook in order to update the Horizon
+   configuration to show the FWaaS panels:
+
+   .. code-block:: shell-session
+
+       # cd /opt/openstack-ansible/playbooks
+       # openstack-ansible os-horizon-install.yml
+
+The FWaaS default configuration options may be changed through the
+`conf override`_ mechanism using the ``neutron_neutron_conf_overrides``
+dict.
+
+Load Balancing Service (Optional)
+---------------------------------------------------------
 
 OpenStack-Ansible currently provides the OpenStack Neutron LBaaS service using
 HAProxy as the load balancer. LBaaS has two implementations available: v1 and
@@ -93,7 +141,48 @@ implementation has different code paths and database tables. Deployers will need
 to manually delete load balancers, pools, and members before switching LBaaS
 versions. Those objects will need to be re-created afterwards.
 
+Virtual Private Network Service (Optional)
+---------------------------------------------------
 
+The following procedure describes how to modify the
+``/etc/openstack_deploy/user_variables.yml`` file to enable VPNaaS.
+
+#. Override the default list of Neutron plugins to include
+   ``vpnaas``:
+
+   .. code-block:: yaml
+
+      neutron_plugin_base:
+        - router
+        - metering
+
+#. The complete `neutron_plugin_base`, at the time of this writing, is as follows:
+
+   .. code-block:: yaml
+
+      neutron_plugin_base:
+         - router
+         - metering
+         - vpnaas
+
+#. Execute the Neutron install playbook in order to update the configuration:
+
+   .. code-block:: shell-session
+
+       # cd /opt/openstack-ansible/playbooks
+       # openstack-ansible os-neutron-install.yml
+
+#. Execute the Horizon install playbook in order to update the Horizon
+   configuration to show the FWaaS panels:
+
+   .. code-block:: shell-session
+
+       # cd /opt/openstack-ansible/playbooks
+       # openstack-ansible os-horizon-install.yml
+
+The VPNaaS default configuration options may be changed through the
+`conf override`_ mechanism using the ``neutron_neutron_conf_overrides``
+dict.
 
 .. _conf override: http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-openstack.html
 

doc/source/install-guide/configure.rst

@@ -20,8 +20,7 @@ Chapter 4. Deployment configuration
    configure-ceilometer.rst
    configure-aodh.rst
    configure-keystone.rst
-   configure-lbaas.rst
+   configure-network-services.rst
-   configure-fwaas.rst
    configure-openstack.rst
    configure-sslcertificates.rst
    configure-configurationintegrity.rst