From 9ef5b5ff421914d63e7343fc1c48951ebd96ebc3 Mon Sep 17 00:00:00 2001 From: "Victor J. Orlikowski" Date: Fri, 26 Feb 2016 11:45:55 -0500 Subject: [PATCH] Change socket-timeout from being a CLI option to being a config file option, since this should not *normally* need to be set on the command line. --- ryu/controller/controller.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index da57a8c..90a800e 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -57,8 +57,12 @@ CONF.register_cli_opts([ help='openflow ssl listen port'), cfg.StrOpt('ctl-privkey', default=None, help='controller private key'), cfg.StrOpt('ctl-cert', default=None, help='controller certificate'), - cfg.StrOpt('ca-certs', default=None, help='CA certificates'), - cfg.FloatOpt('socket-timeout', default=5.0, help='Time, in seconds, to await completion of socket operations.') + cfg.StrOpt('ca-certs', default=None, help='CA certificates') +]) +CONF.register_opts([ + cfg.FloatOpt('socket-timeout', + default=5.0, + help='Time, in seconds, to await completion of socket operations.') ]) -- 2.5.4 (Apple Git-61)