conf: fix formatting in wsgi

* Removed leading space before asterisks in listings
  which causes list to be wrapped in blockquote tag [0]
* Removed redundant empty lines in code

[0] http://docs.openstack.org/newton/config-reference/compute/config-options.html

Change-Id: I4c26650b08e1f89cd8a0ffa3a35c87e66873f0f5
Implements: blueprint centralize-config-options-ocata
This commit is contained in:
Maciej Szankin 2016-11-10 13:34:28 -06:00
parent 2d2744339d
commit 7b5ea2c508

View File

@ -33,9 +33,9 @@ ALL_OPTS = [
This option represents a file name for the paste.deploy config for nova-api. This option represents a file name for the paste.deploy config for nova-api.
Possible values: Possible values:
* A string representing file name for the paste.deploy config.
"""),
* A string representing file name for the paste.deploy config.
"""),
# TODO(sfinucan): It is not possible to rename this to 'log_format' # TODO(sfinucan): It is not possible to rename this to 'log_format'
# yet, as doing so would cause a conflict if '[DEFAULT] log_format' # yet, as doing so would cause a conflict if '[DEFAULT] log_format'
# were used. When 'deprecated_group' is removed after Ocata, this # were used. When 'deprecated_group' is removed after Ocata, this
@ -54,11 +54,10 @@ This option is used for building custom request loglines.
Possible values: Possible values:
* '%(client_ip)s "%(request_line)s" status: %(status_code)s' * '%(client_ip)s "%(request_line)s" status: %(status_code)s'
'len: %(body_length)s time: %(wall_seconds).7f' (default) 'len: %(body_length)s time: %(wall_seconds).7f' (default)
* Any formatted string formed by specific values. * Any formatted string formed by specific values.
"""), """),
cfg.StrOpt( cfg.StrOpt(
'secure_proxy_ssl_header', 'secure_proxy_ssl_header',
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
@ -68,10 +67,9 @@ for the original request, even if it was removed by a SSL terminating proxy.
Possible values: Possible values:
* None (default) - the request scheme is not influenced by any HTTP headers. * None (default) - the request scheme is not influenced by any HTTP headers.
* Valid HTTP header, like HTTP_X_FORWARDED_PROTO * Valid HTTP header, like HTTP_X_FORWARDED_PROTO
"""), """),
cfg.StrOpt( cfg.StrOpt(
'ssl_ca_file', 'ssl_ca_file',
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
@ -81,13 +79,12 @@ to verify connecting clients.
Possible values: Possible values:
* String representing path to the CA certificate file. * String representing path to the CA certificate file.
Related options: Related options:
* enabled_ssl_apis * enabled_ssl_apis
"""), """),
cfg.StrOpt( cfg.StrOpt(
'ssl_cert_file', 'ssl_cert_file',
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
@ -96,13 +93,12 @@ This option allows setting path to the SSL certificate of API server.
Possible values: Possible values:
* String representing path to the SSL certificate. * String representing path to the SSL certificate.
Related options: Related options:
* enabled_ssl_apis * enabled_ssl_apis
"""), """),
cfg.StrOpt( cfg.StrOpt(
'ssl_key_file', 'ssl_key_file',
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
@ -112,13 +108,12 @@ server is stored when SSL is in effect.
Possible values: Possible values:
* String representing path to the SSL private key. * String representing path to the SSL private key.
Related options: Related options:
* enabled_ssl_apis * enabled_ssl_apis
"""), """),
cfg.IntOpt( cfg.IntOpt(
'tcp_keepidle', 'tcp_keepidle',
min=0, min=0,
@ -132,9 +127,8 @@ active. Not supported on OS X.
Related options: Related options:
* keep_alive * keep_alive
"""), """),
cfg.IntOpt( cfg.IntOpt(
'default_pool_size', 'default_pool_size',
min=0, min=0,
@ -146,7 +140,6 @@ This option specifies the size of the pool of greenthreads used by wsgi.
It is possible to limit the number of concurrent connections using this It is possible to limit the number of concurrent connections using this
option. option.
"""), """),
cfg.IntOpt( cfg.IntOpt(
'max_header_line', 'max_header_line',
min=0, min=0,
@ -162,7 +155,6 @@ has to have a way to indicate the end of the previous response and beginning
of the next. Hence, in a keep_alive case, all messages must have a of the next. Hence, in a keep_alive case, all messages must have a
self-defined message length. self-defined message length.
"""), """),
cfg.BoolOpt( cfg.BoolOpt(
'keep_alive', 'keep_alive',
default=True, default=True,
@ -175,14 +167,13 @@ request/response pair. HTTP keep-alive indicates HTTP connection reuse.
Possible values: Possible values:
* True : reuse HTTP connection. * True : reuse HTTP connection.
* False : closes the client socket connection explicitly. * False : closes the client socket connection explicitly.
Related options: Related options:
* tcp_keepidle * tcp_keepidle
"""), """),
cfg.IntOpt( cfg.IntOpt(
'client_socket_timeout', 'client_socket_timeout',
min=0, min=0,