Browse code

Stop running setup_devel for Ryu

It doesn't work here for various reasons.
- Ryu's setup.py is incompatible with global requirements
- This code is called before install_infra.

Ryu is not a part of OpenStack anyway.

Closes-Bug: 1287569
Change-Id: I01a942411f7d06bdf8f1fec5d1a0bc319560f329

YAMAMOTO Takashi authored on 2014/02/24 22:02:08
Showing 1 changed files
... ...
@@ -18,14 +18,8 @@ RYU_OFP_PORT=${RYU_OFP_PORT:-6633}
18 18
 # Ryu Applications
19 19
 RYU_APPS=${RYU_APPS:-ryu.app.simple_isolation,ryu.app.rest}
20 20
 
21
-# configure_ryu can be called multiple times as neutron_pluing/ryu may call
22
-# this function for neutron-ryu-agent
23
-_RYU_CONFIGURED=${_RYU_CONFIGURED:-False}
24 21
 function configure_ryu {
25
-    if [[ "$_RYU_CONFIGURED" == "False" ]]; then
26
-        setup_develop $RYU_DIR
27
-        _RYU_CONFIGURED=True
28
-    fi
22
+    :
29 23
 }
30 24
 
31 25
 function init_ryu {
... ...
@@ -63,6 +57,7 @@ _RYU_INSTALLED=${_RYU_INSTALLED:-False}
63 63
 function install_ryu {
64 64
     if [[ "$_RYU_INSTALLED" == "False" ]]; then
65 65
         git_clone $RYU_REPO $RYU_DIR $RYU_BRANCH
66
+        export PYTHONPATH=$RYU_DIR:$PYTHONPATH
66 67
         _RYU_INSTALLED=True
67 68
     fi
68 69
 }