summaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-02-12 17:20:58 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-02-14 12:34:08 +0900
commit3e79fbd56a7c7d0479e5a4e6a900af546a3d1020 (patch)
tree44bfb4c2217b5c1cad3ae3f46088608d9521e178 /bin
parent6be8ef390687376eec1464a7ea451a2912cb7f44 (diff)
adjust import order in ryu-manager and add a comment.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ryu-manager15
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index d53906b1..1e8d3aa6 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -20,6 +20,15 @@ import gevent
from gevent import monkey
monkey.patch_all()
+# TODO:
+# Right now, we have our own patched copy of ovs python bindings
+# Once our modification is upstreamed and widely deployed,
+# use it
+#
+# NOTE: this modifies sys.path and thus affects the following imports.
+# eg. openstack.common.cfg.
+import ryu.contrib
+
from openstack.common import cfg
import logging
import sys
@@ -33,12 +42,6 @@ from ryu.app import wsgi
from ryu.base.app_manager import AppManager
from ryu.controller import controller
-# TODO:
-# Right now, we have our own patched copy of ovs python bindings
-# Once our modification is upstreamed and widely deployed,
-# use it
-import ryu.contrib
-
CONF = cfg.CONF
CONF.register_cli_opts([