Remove provider router configuration
To be compatible with the Icehouse release of MidoNet, the
provider router configuration is removed from devstack since
it is no longer necessary to configure it.
Change-Id: I4be2d9bbf2c82fd375702cbb1d60c3277086134f
Implements: blueprint remove-provider-router-config-for-midonet
diff --git a/lib/neutron_plugins/midonet b/lib/neutron_plugins/midonet
index f95fcb7..dd3b2ba 100644
--- a/lib/neutron_plugins/midonet
+++ b/lib/neutron_plugins/midonet
@@ -1,6 +1,10 @@
# Neutron MidoNet plugin
# ----------------------
+MIDONET_DIR=${MIDONET_DIR:-$DEST/midonet}
+MIDONET_API_PORT=${MIDONET_API_PORT:-8080}
+MIDONET_API_URL=${MIDONET_API_URL:-http://localhost:$MIDONET_API_PORT/midonet-api}
+
# Save trace setting
MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace
@@ -47,8 +51,8 @@
}
function neutron_plugin_configure_service() {
- if [[ "$MIDONET_API_URI" != "" ]]; then
- iniset /$Q_PLUGIN_CONF_FILE MIDONET midonet_uri $MIDONET_API_URI
+ if [[ "$MIDONET_API_URL" != "" ]]; then
+ iniset /$Q_PLUGIN_CONF_FILE MIDONET midonet_uri $MIDONET_API_URL
fi
if [[ "$MIDONET_USERNAME" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE MIDONET username $MIDONET_USERNAME
@@ -59,9 +63,6 @@
if [[ "$MIDONET_PROJECT_ID" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE MIDONET project_id $MIDONET_PROJECT_ID
fi
- if [[ "$MIDONET_PROVIDER_ROUTER_ID" != "" ]]; then
- iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $MIDONET_PROVIDER_ROUTER_ID
- fi
Q_L3_ENABLED=True
Q_L3_ROUTER_PER_TENANT=True