1. devstack
  2. Commit 18d5c833d47e41c8c8dcd73f35268d6e2b43df5b
Browse code

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

Ryu Ishimoto authored on 2014/02/19 00:33:46
Showing 2 changed files
lib/neutron_plugins/midonet
History View file @ 18d5c83
... ... 
@@ -1,6 +1,10 @@
1 1 
 # Neutron MidoNet plugin
2 2 
 # ----------------------
3 3
4 
+MIDONET_DIR=${MIDONET_DIR:-$DEST/midonet}
5 
+MIDONET_API_PORT=${MIDONET_API_PORT:-8080}
6 
+MIDONET_API_URL=${MIDONET_API_URL:-http://localhost:$MIDONET_API_PORT/midonet-api}
7 
+
4 8 
 # Save trace setting
5 9 
 MY_XTRACE=$(set +o | grep xtrace)
6 10 
 set +o xtrace
... ... 
@@ -47,8 +51,8 @@ function neutron_plugin_configure_plugin_agent() {
47 47 
 }
48 48
49 49 
 function neutron_plugin_configure_service() {
50 
-    if [[ "$MIDONET_API_URI" != "" ]]; then
51 
-        iniset /$Q_PLUGIN_CONF_FILE MIDONET midonet_uri $MIDONET_API_URI
50 
+    if [[ "$MIDONET_API_URL" != "" ]]; then
51 
+        iniset /$Q_PLUGIN_CONF_FILE MIDONET midonet_uri $MIDONET_API_URL
52 52 
     fi
53 53 
     if [[ "$MIDONET_USERNAME" != "" ]]; then
54 54 
         iniset /$Q_PLUGIN_CONF_FILE MIDONET username $MIDONET_USERNAME
... ... 
@@ -59,9 +63,6 @@ function neutron_plugin_configure_service() {
59 59 
     if [[ "$MIDONET_PROJECT_ID" != "" ]]; then
60 60 
         iniset /$Q_PLUGIN_CONF_FILE MIDONET project_id $MIDONET_PROJECT_ID
61 61 
     fi
62 
-    if [[ "$MIDONET_PROVIDER_ROUTER_ID" != "" ]]; then
63 
-        iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $MIDONET_PROVIDER_ROUTER_ID
64 
-    fi
65 62
66 63 
     Q_L3_ENABLED=True
67 64 
     Q_L3_ROUTER_PER_TENANT=True
lib/neutron_thirdparty/midonet
History View file @ 18d5c83
... ... 
@@ -10,20 +10,12 @@
10 10
11 11 
 # MidoNet devstack destination dir
12 12 
 MIDONET_DIR=${MIDONET_DIR:-$DEST/midonet}
13 
-MIDONET_API_PORT=${MIDONET_API_PORT:-8080}
14 
-MIDONET_API_URL=${MIDONET_API_URL:-http://localhost:$MIDONET_API_PORT/midonet-api}
15 13
16 14 
 # MidoNet client repo
17 15 
 MIDONET_CLIENT_REPO=${MIDONET_CLIENT_REPO:-https://github.com/midokura/python-midonetclient.git}
18 16 
 MIDONET_CLIENT_BRANCH=${MIDONET_CLIENT_BRANCH:-master}
19 17 
 MIDONET_CLIENT_DIR=${MIDONET_CLIENT_DIR:-$MIDONET_DIR/python-midonetclient}
20 18
21 
-# MidoNet OpenStack repo
22 
-MIDONET_OS_REPO=${MIDONET_OS_REPO:-https://github.com/midokura/midonet-openstack.git}
23 
-MIDONET_OS_BRANCH=${MIDONET_OS_BRANCH:-master}
24 
-MIDONET_OS_DIR=${MIDONET_OS_DIR:-$MIDONET_DIR/midonet-openstack}
25 
-MIDONET_SETUP_SCRIPT=${MIDONET_SETUP_SCRIPT:-$MIDONET_OS_DIR/bin/setup_midonet_topology.py}
26 
-
27 19 
 # Save trace setting
28 20 
 MY_XTRACE=$(set +o | grep xtrace)
29 21 
 set +o xtrace
... ... 
@@ -33,19 +25,12 @@ function configure_midonet() {
33 33 
 }
34 34
35 35 
 function init_midonet() {
36 
-
37 
-    # Initialize DB.  Evaluate the output of setup_midonet_topology.py to set
38 
-    # env variables for provider router ID.
39 
-    eval `python $MIDONET_SETUP_SCRIPT $MIDONET_API_URL admin $ADMIN_PASSWORD admin provider_devices`
40 
-    die_if_not_set $LINENO provider_router_id "Error running midonet setup script, provider_router_id was not set."
41 
-
42 
-    iniset /$Q_PLUGIN_CONF_FILE MIDONET provider_router_id $provider_router_id
36 
+    :
43 37 
 }
44 38
45 39 
 function install_midonet() {
46 40 
     git_clone $MIDONET_CLIENT_REPO $MIDONET_CLIENT_DIR $MIDONET_CLIENT_BRANCH
47 
-    git_clone $MIDONET_OS_REPO $MIDONET_OS_DIR $MIDONET_OS_BRANCH
48 
-    export PYTHONPATH=$MIDONET_CLIENT_DIR/src:$MIDONET_OS_DIR/src:$PYTHONPATH
41 
+    export PYTHONPATH=$MIDONET_CLIENT_DIR/src:$PYTHONPATH
49 42 
 }
50 43
51 44 
 function start_midonet() {