commit 87acc91fc67dd2c349008aad9a4f6c1770f3eb7e
author Joe Mills <joe@midokura.com> Tue Oct 01 08:13:06 2013 +0000
committer Joe Mills <joe@midokura.com> Wed Oct 02 03:22:39 2013 +0000
tree 6757c6280f5e9fa441e687dad6da68a5a2a8d255
parent 1c1aef0eb7796f0fe8b2502eb4aaa62369b7842a

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 <joe@midokura.com>

lib/neutron_plugins/midonet

diff --git a/lib/neutron_plugins/midonet b/lib/neutron_plugins/midonet
index 0ad760b..f09c675 100644
--- a/lib/neutron_plugins/midonet
+++ b/lib/neutron_plugins/midonet
@@ -37,6 +37,18 @@
     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() {