openstack
/
tripleo-image-elements
Code Issues Proposed changes

Move dnsmasq-neutron.conf into subdir 

If you try to use a custom Neutron dnsmasq conf file today many
of the Neutron servers will fail to start with the following
error messages:

oslo.config.cfg.ConfigFileParseError: Failed to parse
/etc/neutron/dnsmasq-neutron.conf: at
/etc/neutron/dnsmasq-neutron.conf:1, Section must be started before
assignment: None

In this patch we move the custom dnsmasq-neutron.conf into
a 'dnsmasq' subdirectory so that the --config-dir options
for our neutron services no longer pick it up by default.

Change-Id: I120fad69a068811403a460507b6b0769e764742f
Closes-bug: #1305254
This commit is contained in:
Dan Prince 2014-04-09 15:08:09 -04:00
parent 91b77ae23b
commit acc6bc44c5
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
View File

@ -10,5 +10,5 @@ dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
{{#neutron.dnsmasq-options}}
dnsmasq_config_file=/etc/neutron/dnsmasq-neutron.conf
dnsmasq_config_file=/etc/neutron/dnsmasq/dnsmasq-neutron.conf
{{/neutron.dnsmasq-options}}

0
elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf → elements/neutron/os-apply-config/etc/neutron/dnsmasq/dnsmasq-neutron.conf
View File