From 7eb35fbef6a3f98148ec746ec20c540543ebe92e Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Wed, 20 Jan 2016 07:58:21 -0600 Subject: [PATCH] Fix HAProxy config docs The HAProxy configuration doesn't appear in openstack_user_config.yml and the example file in the conf.d directory isn't well documented. This documentation patch alerts deployers to the example configuration file and tells them how to activate/configure it. Closes-Bug: 1535874 Change-Id: I6a165f90914570f52a0205622fedf6c91e5ba3fb --- doc/source/install-guide/configure-haproxy.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/source/install-guide/configure-haproxy.rst b/doc/source/install-guide/configure-haproxy.rst index f67495ccf2..8d5ff29c6a 100644 --- a/doc/source/install-guide/configure-haproxy.rst +++ b/doc/source/install-guide/configure-haproxy.rst @@ -9,9 +9,8 @@ default HAProxy configuration does not provide highly-available load balancing services. For production deployments, deploy a hardware load balancer prior to deploying OSA. -- In the ``/etc/openstack_deploy/openstack_user_config.yml`` file, add - the ``haproxy_hosts`` section with one or more infrastructure target - hosts, for example: +To deploy HAProxy within your OpenStack-Ansible environment, define target +hosts which should run HAProxy: .. code-block:: yaml @@ -23,6 +22,11 @@ balancer prior to deploying OSA. 123458-infra03: ip: 172.29.236.53 +There is an example configuration file already provided in +``/etc/openstack_deploy/conf.d/haproxy.yml.example``. Rename the file to +``haproxy.yml`` and configure it with the correct target hosts to use HAProxy +in an OpenStack-Ansible deployment. + Making HAProxy highly-available ###############################