Move dnsmasq-neutron.conf into a subdir

Update our docs to suggest that the optional dnsmasq-neutron.conf
live in a subdirectory called 'dnsmasq'. This fixes potential
issues in following these instructions where Neutron
services may be configured to use --config-dir option which
would cause this .conf file (which is in a dnsmasq format)
gets picked up and thus causes service startup failures.

See also TripleO bug #1305254

Change-Id: I169cc54d534ed1e91550854722071858ea0d0069
This commit is contained in:
Dan Prince 2014-04-10 10:37:21 -04:00
parent 805ebad292
commit 6ebbdf645d

View File

@ -623,11 +623,11 @@ local_ip=&lt;data-net-IP-address-of-node&gt;</programlisting>
these lines to the
<filename>/etc/neutron/dhcp_agent.ini</filename>
file:</para>
<programlisting language="ini">dnsmasq_config_file=/etc/neutron/dnsmasq-neutron.conf</programlisting>
<programlisting language="ini">dnsmasq_config_file=/etc/neutron/dnsmasq/dnsmasq-neutron.conf</programlisting>
</step>
<step>
<para>Create
<filename>/etc/neutron/dnsmasq-neutron.conf</filename>,
<filename>/etc/neutron/dnsmasq/dnsmasq-neutron.conf</filename>,
and add these values to lower the MTU size
on instances and prevent packet
fragmentation over the GRE tunnel:</para>