try to sync the documentation with the reality at least about gflags/cfg changes.
Signed-off-by: YAMAMOTO Takashi <[email protected]> --- doc/source/parameters.rst | 17 +++++++++-------- doc/source/step_by_step.rst | 9 +++++---- doc/source/using_with_openstack.rst | 2 +- etc/ryu/ryu.conf | 10 ++++++---- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/doc/source/parameters.rst b/doc/source/parameters.rst index de7c0df..fcad6b7 100644 --- a/doc/source/parameters.rst +++ b/doc/source/parameters.rst @@ -90,15 +90,16 @@ The options for log:: --[no]verbose: show debug output (default: 'false') -The option for gflags:: +The option for openstack.common.cfg:: - --flagfile: Insert flag definitions from the given file into the command line. - (default: '') - --undefok: comma-separated list of flag names that it is okay to specify on - the command line even if the program does not define a flag with that name. - IMPORTANT: flags in this list that have arguments MUST use the --flag=value - format. - (default: '') + --config-file: Path to a config file to use. Multiple config files + can be specified, with values in later files taking precedence. + (default: []) + --config-dir: Path to a config directory to pull *.conf files from. + This file set is sorted, so as to provide a predictable parse order if + individual options are over-ridden. The set is parsed after the file(s), + if any, specified via --config-file, hence over-ridden options in the + directory take precedence. The options for event dumper:: diff --git a/doc/source/step_by_step.rst b/doc/source/step_by_step.rst index 3305cc9..903499f 100644 --- a/doc/source/step_by_step.rst +++ b/doc/source/step_by_step.rst @@ -359,7 +359,8 @@ If you use default configurations, you don't have to modify it. Just leave it blank:: # Sample configuration file - #--wsapi_host=<hostip> - #--wsapi_port=<port:8080> - #--ofp_listen_host=<hostip> - #--ofp_listen_port=<port:6633> + [DEFAULT] + #wsapi_host=<hostip> + #wsapi_port=<port:8080> + #ofp_listen_host=<hostip> + #ofp_listen_port=<port:6633> diff --git a/doc/source/using_with_openstack.rst b/doc/source/using_with_openstack.rst index db8a9d3..60f1a4b 100644 --- a/doc/source/using_with_openstack.rst +++ b/doc/source/using_with_openstack.rst @@ -74,7 +74,7 @@ from the source, please refer to OpenStack document and get back here again. * run ryu network os:: - % ryu-manager [----flagfile /etc/ryu/ryu.conf] + % ryu-manager * get nova source and quantum source from github diff --git a/etc/ryu/ryu.conf b/etc/ryu/ryu.conf index 3b6ca1b..341de67 100644 --- a/etc/ryu/ryu.conf +++ b/etc/ryu/ryu.conf @@ -1,6 +1,8 @@ # Sample configuration file -#--wsapi_host=<hostip> -#--wsapi_port=<port:8080> -#--ofp_listen_host=<hostip> -#--ofp_listen_port=<port:6633> +[DEFAULT] + +#wsapi_host=<hostip> +#wsapi_port=<port:8080> +#ofp_listen_host=<hostip> +#ofp_listen_port=<port:6633> -- 1.7.12 ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
