summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-03-05 13:18:01 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-03-06 01:32:14 +0900
commita776d026cb21bc582773a1ceb47b8b8ce208980b (patch)
tree3075fde8cfa79418f3439b47822915b872f4e7dc
parentdb27b8f17114bb5662ffd02fe1787594cbb4463f (diff)
ryu-manager: stop modifying CONF.app_list
to make cli show-options a little prettier. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rwxr-xr-xbin/ryu-manager5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index f154bfef..03b1b79f 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -58,11 +58,10 @@ def main():
log.init_log()
# always enable ofp for now.
- CONF.app_lists += ['ryu.controller.ofp_handler']
- CONF.app_lists += CONF.app
+ app_lists = CONF.app_lists + CONF.app + ['ryu.controller.ofp_handler']
app_mgr = AppManager()
- app_mgr.load_apps(CONF.app_lists)
+ app_mgr.load_apps(app_lists)
contexts = app_mgr.create_contexts()
app_mgr.instantiate_apps(**contexts)