openstack
/
keystone
Code Issues Proposed changes

Fix deprecated group for eventlet_server options 

Several eventlet_server options were moved from the DEFAULT group
and the old DEFAULT group values are deprecated, but since the
deprecated_group wasn't set the oslo.config code was using the
options' new group as the deprecated group. This caused the
server to report that the new values were deprecated when used.

Change-Id: I98bb59b20e50490bdf054df68b5de055abc3db81
Closes-Bug: 1431088
This commit is contained in:
Brant Knudson 2015-03-11 19:47:33 -05:00
parent d87768313b
commit 42d280fbe1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/common/config.py
View File

@ -973,11 +973,13 @@ FILE_OPTIONS = {
'eventlet_server': [
cfg.IntOpt('public_workers',
deprecated_name='public_workers',
deprecated_group='DEFAULT',
help='The number of worker processes to serve the public '
'eventlet application. Defaults to number of CPUs '
'(minimum of 2).'),
cfg.IntOpt('admin_workers',
deprecated_name='admin_workers',
deprecated_group='DEFAULT',
help='The number of worker processes to serve the admin '
'eventlet application. Defaults to number of CPUs '
'(minimum of 2).'),
@ -990,6 +992,7 @@ FILE_OPTIONS = {
help='The IP address of the network interface for the '
'public service to listen on.'),
cfg.IntOpt('public_port', default=5000, deprecated_name='public_port',
deprecated_group='DEFAULT',
help='The port number which the public service listens '
'on.'),
cfg.StrOpt('admin_bind_host',
@ -1001,10 +1004,12 @@ FILE_OPTIONS = {
help='The IP address of the network interface for the '
'admin service to listen on.'),
cfg.IntOpt('admin_port', default=35357, deprecated_name='admin_port',
deprecated_group='DEFAULT',
help='The port number which the admin service listens '
'on.'),
cfg.BoolOpt('tcp_keepalive', default=False,
deprecated_name='tcp_keepalive',
deprecated_group='DEFAULT',
help='Set this to true if you want to enable '
'TCP_KEEPALIVE on server sockets, i.e. sockets used '
'by the Keystone wsgi server for client '
@ -1012,6 +1017,7 @@ FILE_OPTIONS = {
cfg.IntOpt('tcp_keepidle',
default=600,
deprecated_name='tcp_keepidle',
deprecated_group='DEFAULT',
help='Sets the value of TCP_KEEPIDLE in seconds for each '
'server socket. Only applies if tcp_keepalive is '
'true.'),