diff options
| author | Victor J. Orlikowski <vjo@duke.edu> | 2016-02-26 11:45:55 -0500 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-02-27 22:06:02 +0900 |
| commit | ed30a8b253da0e26d93d403214e5f7029507af09 (patch) | |
| tree | 19d75de02fa6fc38b61ed22907e086f21dede397 | |
| parent | 477f2ddd70d2a7709a04fe3062a52078139b9fa7 (diff) | |
make socket-timeout config file option
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.
Signed-off-by: Victor J. Orlikowski <vjo@duke.edu>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/controller/controller.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index da57a8ce..90a800ee 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.') ]) |