diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-02 09:23:10 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 13:54:04 -0700 |
| commit | 2ef9203ece3a7db1b7d27dbe2012964407d6c7b6 (patch) | |
| tree | 9c3b193ac8358ba8727e5c04f722be2c21b10545 | |
| parent | 4942e642cf675554458fe0131361cacee482c55c (diff) | |
| download | kolla-2ef9203ece3a7db1b7d27dbe2012964407d6c7b6.tar.gz kolla-2ef9203ece3a7db1b7d27dbe2012964407d6c7b6.zip | |
Move dnsmasq-neutron.conf to /etc/neutron/dnsmasq
The default dnsmasq configuration file doesn't operate with the Kilo
agents in /etc/neutron when used with the --config-dir option. Instead move
it to a subdirectory.
Change-Id: Iab8a54e879f8e630ba38205750ca9670e82834df
Partially-Implements: blueprint port-kilo
| -rwxr-xr-x | docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh index 98c940472..1295d9c57 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh @@ -8,9 +8,11 @@ set -e : ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq} : ${USE_NAMESPACES:=true} : ${DELETE_NAMESPACES:=true} -: ${DNSMASQ_CONFIG_FILE:=/etc/neutron/dnsmasq-neutron.conf} +: ${DNSMASQ_CONFIG_FILE:=/etc/neutron/dnsmasq/dnsmasq-neutron.conf} : ${ROOT_HELPER:=sudo neutron-rootwrap /etc/neutron/rootwrap.conf} +mkdir -p $(dirname $DNSMASQ_CONFIG_FILE) + check_required_vars VERBOSE_LOGGING DEBUG_LOGGING MECHANISM_DRIVERS \ DHCP_DRIVER USE_NAMESPACES DELETE_NAMESPACES \ NEUTRON_LOG_DIR DNSMASQ_CONFIG_FILE \ |