4075af6a11
This was originally fixed in commit 7578326 but this caused problems. It was subsequently reverted in commit 6d2e9ee. This change uses a common DHCPAgentContext and takes care to check for a pre-existing setting in the dhcp_agent.ini. Only allowing a config change if there is no pre-existing setting. Please review and merge charm-helpers PR: https://github.com/juju/charm-helpers/pull/422 Partial-Bug: #1831935 func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/157 Change-Id: I4848a3246d3450540acb8d2f479dfa2e7767be60
21 lines
691 B
INI
21 lines
691 B
INI
###############################################################################
|
|
# [ WARNING ]
|
|
# Configuration file maintained by Juju. Local changes may be overwritten.
|
|
# {{ restart_trigger_dhcp }}
|
|
###############################################################################
|
|
|
|
[DEFAULT]
|
|
state_path = /var/lib/neutron
|
|
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
|
|
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
|
|
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
|
|
|
{% if dnsmasq_flags -%}
|
|
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
|
|
{% endif -%}
|
|
|
|
enable_metadata_network = True
|
|
enable_isolated_metadata = True
|
|
|
|
ovs_use_veth = {{ ovs_use_veth }}
|