diff --git a/doc/source/install-guide/configure-fwaas.rst b/doc/source/install-guide/configure-fwaas.rst deleted file mode 100644 index 7fc017740b..0000000000 --- a/doc/source/install-guide/configure-fwaas.rst +++ /dev/null @@ -1,57 +0,0 @@ -`Home `_ 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 diff --git a/doc/source/install-guide/configure-lbaas.rst b/doc/source/install-guide/configure-network-services.rst similarity index 50% rename from doc/source/install-guide/configure-lbaas.rst rename to doc/source/install-guide/configure-network-services.rst index 0920895510..9d3b198935 100644 --- a/doc/source/install-guide/configure-lbaas.rst +++ b/doc/source/install-guide/configure-network-services.rst @@ -1,13 +1,61 @@ `Home `_ 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 -Service (LBaaS). This service lets you configure a load balancer that runs -outside of your instances and directs traffic to your instances. A common use -case is when you want to use multiple instances to serve web pages and want to -meet high performance or availability goals. +The OpenStack Networking Service, Neutron, includes the following services: + - Firewall as a Service (FWaaS) allows for the configuration of a firewall that filters traffic from the router. + - Load Balancer as a Service (LBaaS) allows for the configuration of a load balancer that directs traffic to the specified instances. + - 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. + +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 diff --git a/doc/source/install-guide/configure.rst b/doc/source/install-guide/configure.rst index 23c6dd7879..01c8464a2f 100644 --- a/doc/source/install-guide/configure.rst +++ b/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-fwaas.rst + configure-network-services.rst configure-openstack.rst configure-sslcertificates.rst configure-configurationintegrity.rst