From c091c8b244d5df16ed0952c660a9f5940bfe41d9 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Sat, 8 Mar 2014 17:34:21 -0500
Subject: [PATCH] Use /etc/neutron/neutron.conf

Use /etc/neutron/neutron.conf for configuration, not
/usr/share/neutron/neutron-dist.conf. The latter is intended for
distributors to provide their recommended settings/overrides but these
are overridden by whatever is in /etc/neutron/neutron.conf.

Change-Id: I4c6037140e969865a47de7873cd985286c8ec13a
Closes-Bug: #1284098
---
 doc/admin-guide-cloud/section_networking_introduction.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/admin-guide-cloud/section_networking_introduction.xml b/doc/admin-guide-cloud/section_networking_introduction.xml
index 0e999fe2ba..45fe320d7b 100644
--- a/doc/admin-guide-cloud/section_networking_introduction.xml
+++ b/doc/admin-guide-cloud/section_networking_introduction.xml
@@ -1267,7 +1267,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
                 <listitem>
                     <para>Enable the <productname>HAProxy</productname>
                     plug-in using the <option>service_provider</option>
-                    parameter in the <filename>/usr/share/neutron/neutron-dist.conf</filename>
+                    parameter in the <filename>/etc/neutron/neutron.conf</filename>
                         file:</para>
                         <programlisting language="ini">
 service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default</programlisting>