From 87acc91fc67dd2c349008aad9a4f6c1770f3eb7e Mon Sep 17 00:00:00 2001 From: Joe Mills Date: Tue, 1 Oct 2013 08:13:06 +0000 Subject: [PATCH] Add MIDONET settings to dhcp.ini The midonet specific settings were not being added to the dhcp specific config file. This change adds those settings. Closes-bug: #1233941 Change-Id: I4155135528c6ba77cf57d30ac256580c7239794f Signed-off-by: Joe Mills --- lib/neutron_plugins/midonet | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/neutron_plugins/midonet b/lib/neutron_plugins/midonet index 0ad760b289..f09c67527e 100644 --- a/lib/neutron_plugins/midonet +++ b/lib/neutron_plugins/midonet @@ -37,6 +37,18 @@ function neutron_plugin_configure_dhcp_agent() { iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver $DHCP_INTERFACE_DRIVER iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces True iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True + if [[ "$MIDONET_API_URI" != "" ]]; then + iniset $Q_DHCP_CONF_FILE MIDONET midonet_uri "$MIDONET_API_URI" + fi + if [[ "$MIDONET_USERNAME" != "" ]]; then + iniset $Q_DHCP_CONF_FILE MIDONET username "$MIDONET_USERNAME" + fi + if [[ "$MIDONET_PASSWORD" != "" ]]; then + iniset $Q_DHCP_CONF_FILE MIDONET password "$MIDONET_PASSWORD" + fi + if [[ "$MIDONET_PROJECT_ID" != "" ]]; then + iniset $Q_DHCP_CONF_FILE MIDONET project_id "$MIDONET_PROJECT_ID" + fi } function neutron_plugin_configure_l3_agent() {