openstack/placement
Code Issues Proposed changes

trivial: Fix alignment of wsgi options

Browse Source 
We're not using Hungarian notation so there's no need to add an
'_opt' suffix on opts. Remove this.

Change-Id: I354d1398f1da30c0d9bb9739cfab74fe397bb042
This commit is contained in:
Stephen Finucane 2016-02-09 18:38:16 +00:00
parent 50307bf408
commit 7b0f5df3be
1 changed files with 78 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
nova/conf/wsgi.py
View File

@ -19,89 +19,99 @@ wsgi_group = cfg.OptGroup(
'wsgi',
title='WSGI Options')
api_paste_config_opt = cfg.StrOpt('api_paste_config',
default="api-paste.ini",
help='File name for the paste.deploy config for nova-api',
deprecated_group='DEFAULT')
api_paste_config = cfg.StrOpt(
'api_paste_config',
default="api-paste.ini",
help='File name for the paste.deploy config for nova-api',
deprecated_group='DEFAULT')
# TODO(sfinucan): It is not possible to rename this to 'log_format'
# yet, as doing so would cause a conflict if '[DEFAULT] log_format'
# were used. When 'deprecated_group' is removed after Ocata, this
# should be changed.
wsgi_log_format_opt = cfg.StrOpt('wsgi_log_format',
default='%(client_ip)s "%(request_line)s" status: %(status_code)s'
' len: %(body_length)s time: %(wall_seconds).7f',
help='A python format string that is used as the template to '
'generate log lines. The following values can be formatted '
'into it: client_ip, date_time, request_line, status_code, '
'body_length, wall_seconds.',
deprecated_group='DEFAULT')
wsgi_log_format = cfg.StrOpt(
'wsgi_log_format',
default='%(client_ip)s "%(request_line)s" status: %(status_code)s'
' len: %(body_length)s time: %(wall_seconds).7f',
help='A python format string that is used as the template to '
'generate log lines. The following values can be formatted '
'into it: client_ip, date_time, request_line, status_code, '
'body_length, wall_seconds.',
deprecated_group='DEFAULT')
secure_proxy_ssl_header_opt = cfg.StrOpt('secure_proxy_ssl_header',
help='The HTTP header used to determine the scheme for the '
'original request, even if it was removed by an SSL '
'terminating proxy. Typical value is '
'"HTTP_X_FORWARDED_PROTO".',
deprecated_group='DEFAULT')
secure_proxy_ssl_header = cfg.StrOpt(
'secure_proxy_ssl_header',
help='The HTTP header used to determine the scheme for the '
'original request, even if it was removed by an SSL '
'terminating proxy. Typical value is '
'"HTTP_X_FORWARDED_PROTO".',
deprecated_group='DEFAULT')
ssl_ca_file_opt = cfg.StrOpt('ssl_ca_file',
help="CA certificate file to use to verify "
"connecting clients",
deprecated_group='DEFAULT')
ssl_ca_file = cfg.StrOpt(
'ssl_ca_file',
help='CA certificate file to use to verify connecting clients',
deprecated_group='DEFAULT')
ssl_cert_file_opt = cfg.StrOpt('ssl_cert_file',
help="SSL certificate of API server",
deprecated_group='DEFAULT')
ssl_cert_file = cfg.StrOpt(
'ssl_cert_file',
help='SSL certificate of API server',
deprecated_group='DEFAULT')
ssl_key_file_opt = cfg.StrOpt('ssl_key_file',
help="SSL private key of API server",
deprecated_group='DEFAULT')
ssl_key_file = cfg.StrOpt(
'ssl_key_file',
help='SSL private key of API server',
deprecated_group='DEFAULT')
tcp_keepidle_opt = cfg.IntOpt('tcp_keepidle',
default=600,
help="Sets the value of TCP_KEEPIDLE in seconds for each "
"server socket. Not supported on OS X.",
deprecated_group='DEFAULT')
tcp_keepidle = cfg.IntOpt(
'tcp_keepidle',
default=600,
help='Sets the value of TCP_KEEPIDLE in seconds for each '
'server socket. Not supported on OS X.',
deprecated_group='DEFAULT')
default_pool_size_opt = cfg.IntOpt('default_pool_size',
default=1000,
help="Size of the pool of greenthreads used by wsgi",
deprecated_group='DEFAULT',
deprecated_name='wsgi_default_pool_size')
default_pool_size = cfg.IntOpt(
'default_pool_size',
default=1000,
help='Size of the pool of greenthreads used by wsgi',
deprecated_group='DEFAULT',
deprecated_name='wsgi_default_pool_size')
max_header_line_opt = cfg.IntOpt('max_header_line',
default=16384,
help="Maximum line size of message headers to be accepted. "
"max_header_line may need to be increased when using "
"large tokens (typically those generated by the "
"Keystone v3 API with big service catalogs).",
deprecated_group='DEFAULT')
max_header_line = cfg.IntOpt(
'max_header_line',
default=16384,
help='Maximum line size of message headers to be accepted. '
'max_header_line may need to be increased when using '
'large tokens (typically those generated by the '
'Keystone v3 API with big service catalogs).',
deprecated_group='DEFAULT')
keep_alive_opt = cfg.BoolOpt('keep_alive',
default=True,
help="If False, closes the client socket connection "
"explicitly.",
deprecated_group='DEFAULT',
deprecated_name='wsgi_keep_alive')
keep_alive = cfg.BoolOpt(
'keep_alive',
default=True,
help='If False, closes the client socket connection explicitly.',
deprecated_group='DEFAULT',
deprecated_name='wsgi_keep_alive')
client_socket_timeout_opt = cfg.IntOpt('client_socket_timeout', default=900,
help="Timeout for client connections' socket operations. "
"If an incoming connection is idle for this number of "
"seconds it will be closed. A value of '0' means "
"wait forever.",
deprecated_group='DEFAULT')
client_socket_timeout = cfg.IntOpt(
'client_socket_timeout',
default=900,
help="Timeout for client connections' socket operations. "
"If an incoming connection is idle for this number of "
"seconds it will be closed. A value of '0' means "
"wait forever.",
deprecated_group='DEFAULT')
ALL_OPTS = [api_paste_config_opt,
wsgi_log_format_opt,
secure_proxy_ssl_header_opt,
ssl_ca_file_opt,
ssl_cert_file_opt,
ssl_key_file_opt,
tcp_keepidle_opt,
default_pool_size_opt,
max_header_line_opt,
keep_alive_opt,
client_socket_timeout_opt
ALL_OPTS = [api_paste_config,
wsgi_log_format,
secure_proxy_ssl_header,
ssl_ca_file,
ssl_cert_file,
ssl_key_file,
tcp_keepidle,
default_pool_size,
max_header_line,
keep_alive,
client_socket_timeout
]