openstack/devstack
Code Issues Proposed changes

Modify midonet plugin to support the latest MidoNet

Browse Source 
MidoNet has been upgraded and devstack needs to be updated to
be compatible.  This change is required to run the current
version of MidoNet plugin with DevStack.

Closes-Bug: #1222314
Change-Id: If3379b4d5da4e4fcf989ee7398b5952d71b68d5a
This commit is contained in:
Ryu Ishimoto 2013-08-27 18:32:00 +09:00
parent b567fc1f6b
commit 35f0966d35
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/neutron_plugins/midonet
View File

@ -31,7 +31,12 @@ function neutron_plugin_configure_debug_command() {
} }
function neutron_plugin_configure_dhcp_agent() { function neutron_plugin_configure_dhcp_agent() {
die $LINENO "q-dhcp must not be executed with MidoNet plugin!" DHCP_DRIVER=${DHCP_DRIVER:-"neutron.plugins.midonet.agent.midonet_driver.DhcpNoOpDriver"}
DHCP_INTERFACE_DRIVER=${DHCP_INTEFACE_DRIVER:-"neutron.plugins.midonet.agent.midonet_driver.MidonetInterfaceDriver"}
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_driver $DHCP_DRIVER
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
} }
function neutron_plugin_configure_l3_agent() { function neutron_plugin_configure_l3_agent() {
@ -58,9 +63,6 @@ function neutron_plugin_configure_service() {
if [[ "$MIDONET_PROVIDER_ROUTER_ID" != "" ]]; then if [[ "$MIDONET_PROVIDER_ROUTER_ID" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $MIDONET_PROVIDER_ROUTER_ID iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $MIDONET_PROVIDER_ROUTER_ID
fi fi
if [[ "$MIDONET_METADATA_ROUTER_ID" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE MIDONET metadata_router_id $MIDONET_METADATA_ROUTER_ID
fi
} }
function neutron_plugin_setup_interface_driver() { function neutron_plugin_setup_interface_driver() {

16
lib/neutron_thirdparty/midonet vendored
View File

@ -10,22 +10,20 @@
# MidoNet devstack destination dir # MidoNet devstack destination dir
MIDONET_DIR=${MIDONET_DIR:-$DEST/midonet} 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}
# MidoNet client repo # MidoNet client repo
MIDONET_CLIENT_REPO=${MIDONET_CLIENT_REPO:-https://github.com/midokura/python-midonetclient.git} MIDONET_CLIENT_REPO=${MIDONET_CLIENT_REPO:-https://github.com/midokura/python-midonetclient.git}
MIDONET_CLIENT_BRANCH=${MIDONET_CLIENT_BRANCH:-master} MIDONET_CLIENT_BRANCH=${MIDONET_CLIENT_BRANCH:-master}
MIDONET_CLIENT_DIR=$MIDONET_DIR/python-midonetclient MIDONET_CLIENT_DIR=${MIDONET_CLIENT_DIR:-$MIDONET_DIR/python-midonetclient}
# MidoNet OpenStack repo # MidoNet OpenStack repo
MIDONET_OS_REPO=${MIDONET_OS_REPO:-https://github.com/midokura/midonet-openstack.git} MIDONET_OS_REPO=${MIDONET_OS_REPO:-https://github.com/midokura/midonet-openstack.git}
MIDONET_OS_BRANCH=${MIDONET_OS_BRANCH:-master} MIDONET_OS_BRANCH=${MIDONET_OS_BRANCH:-master}
MIDONET_OS_DIR=$MIDONET_DIR/midonet-openstack MIDONET_OS_DIR=${MIDONET_OS_DIR:-$MIDONET_DIR/midonet-openstack}
MIDONET_SETUP_SCRIPT=${MIDONET_SETUP_SCRIPT:-$MIDONET_OS_DIR/bin/setup_midonet_topology.py} MIDONET_SETUP_SCRIPT=${MIDONET_SETUP_SCRIPT:-$MIDONET_OS_DIR/bin/setup_midonet_topology.py}
MIDOLMAN_LOG=${MIDOLMAN_LOG:-/var/log/midolman/midolman.log}
MIDONET_API_LOG=${MIDONET_API_LOG:-/var/log/tomcat7/midonet-api.log}
# Save trace setting # Save trace setting
MY_XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
@ -37,13 +35,11 @@ function configure_midonet() {
function init_midonet() { function init_midonet() {
# Initialize DB. Evaluate the output of setup_midonet_topology.py to set # Initialize DB. Evaluate the output of setup_midonet_topology.py to set
# env variables for provider router ID and metadata router ID # env variables for provider router ID.
eval `python $MIDONET_SETUP_SCRIPT admin $ADMIN_PASSWORD $ADMIN_TENANT provider_devices` eval `python $MIDONET_SETUP_SCRIPT $MIDONET_API_URL admin $ADMIN_PASSWORD admin provider_devices`
die_if_not_set $LINENO provider_router_id "Error running midonet setup script, provider_router_id was not set." die_if_not_set $LINENO provider_router_id "Error running midonet setup script, provider_router_id was not set."
die_if_not_set $LINENO metadata_router_id "Error running midonet setup script, metadata_router_id was not set."
iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $provider_router_id iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $provider_router_id
iniset /$Q_PLUGIN_CONF_FILE MIDONET metadata_router_id $metadata_router_id
} }
function install_midonet() { function install_midonet() {