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>
| ... | ... |
@@ -37,6 +37,18 @@ function neutron_plugin_configure_dhcp_agent() {
|
| 37 | 37 |
iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver $DHCP_INTERFACE_DRIVER |
| 38 | 38 |
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces True |
| 39 | 39 |
iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True |
| 40 |
+ if [[ "$MIDONET_API_URI" != "" ]]; then |
|
| 41 |
+ iniset $Q_DHCP_CONF_FILE MIDONET midonet_uri "$MIDONET_API_URI" |
|
| 42 |
+ fi |
|
| 43 |
+ if [[ "$MIDONET_USERNAME" != "" ]]; then |
|
| 44 |
+ iniset $Q_DHCP_CONF_FILE MIDONET username "$MIDONET_USERNAME" |
|
| 45 |
+ fi |
|
| 46 |
+ if [[ "$MIDONET_PASSWORD" != "" ]]; then |
|
| 47 |
+ iniset $Q_DHCP_CONF_FILE MIDONET password "$MIDONET_PASSWORD" |
|
| 48 |
+ fi |
|
| 49 |
+ if [[ "$MIDONET_PROJECT_ID" != "" ]]; then |
|
| 50 |
+ iniset $Q_DHCP_CONF_FILE MIDONET project_id "$MIDONET_PROJECT_ID" |
|
| 51 |
+ fi |
|
| 40 | 52 |
} |
| 41 | 53 |
|
| 42 | 54 |
function neutron_plugin_configure_l3_agent() {
|