diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-02-12 17:20:59 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-02-14 12:34:08 +0900 |
| commit | 9ba977fa41abd4c82f6b4c2d6ab8870309efc9c9 (patch) | |
| tree | fd28879d7b906f74b24dc622de0e8880d6af75e8 /doc | |
| parent | 3e79fbd56a7c7d0479e5a4e6a900af546a3d1020 (diff) | |
update a sample and documentation
try to sync the documentation with the reality at least about
gflags/cfg changes.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/parameters.rst | 17 | ||||
| -rw-r--r-- | doc/source/step_by_step.rst | 9 | ||||
| -rw-r--r-- | doc/source/using_with_openstack.rst | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/doc/source/parameters.rst b/doc/source/parameters.rst index 2fb27a7d..d2f77924 100644 --- a/doc/source/parameters.rst +++ b/doc/source/parameters.rst @@ -93,15 +93,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 ab93b869..54f99ffb 100644 --- a/doc/source/step_by_step.rst +++ b/doc/source/step_by_step.rst @@ -367,7 +367,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 db8a9d3a..60f1a4bf 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 |