Deprecate eventlet config options

With the deprecation of the eventlet server, also deprecate the
config options for it.

Change-Id: Idb9f232a3feb7fa406e74bee0fe77de24f4b562e

1 files changed, 13 insertions, 0 deletions

diff --git a/keystone/common/config.py b/keystone/common/config.py
index 6b2573f82..ebc1c2fa7 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -988,12 +988,14 @@ FILE_OPTIONS = {
         cfg.IntOpt('public_workers',
                    deprecated_name='public_workers',
                    deprecated_group='DEFAULT',
+                   deprecated_for_removal=True,
                    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',
+                   deprecated_for_removal=True,
                    help='The number of worker processes to serve the admin '
                         'eventlet application. Defaults to number of CPUs '
                         '(minimum of 2).'),
@@ -1003,10 +1005,12 @@ FILE_OPTIONS = {
                                                       group='DEFAULT'),
                                     cfg.DeprecatedOpt('public_bind_host',
                                                       group='DEFAULT'), ],
+                   deprecated_for_removal=True,
                    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',
+                   deprecated_for_removal=True,
                    help='The port number which the public service listens '
                         'on.'),
         cfg.StrOpt('admin_bind_host',
@@ -1015,15 +1019,18 @@ FILE_OPTIONS = {
                                                       group='DEFAULT'),
                                     cfg.DeprecatedOpt('admin_bind_host',
                                                       group='DEFAULT')],
+                   deprecated_for_removal=True,
                    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',
+                   deprecated_for_removal=True,
                    help='The port number which the admin service listens '
                         'on.'),
         cfg.BoolOpt('tcp_keepalive', default=False,
                     deprecated_name='tcp_keepalive',
                     deprecated_group='DEFAULT',
+                    deprecated_for_removal=True,
                     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 '
@@ -1032,6 +1039,7 @@ FILE_OPTIONS = {
                    default=600,
                    deprecated_name='tcp_keepidle',
                    deprecated_group='DEFAULT',
+                   deprecated_for_removal=True,
                    help='Sets the value of TCP_KEEPIDLE in seconds for each '
                         'server socket. Only applies if tcp_keepalive is '
                         'true.'),
@@ -1039,11 +1047,13 @@ FILE_OPTIONS = {
     'eventlet_server_ssl': [
         cfg.BoolOpt('enable', default=False, deprecated_name='enable',
                     deprecated_group='ssl',
+                    deprecated_for_removal=True,
                     help='Toggle for SSL support on the Keystone '
                          'eventlet servers.'),
         cfg.StrOpt('certfile',
                    default="/etc/keystone/ssl/certs/keystone.pem",
                    deprecated_name='certfile', deprecated_group='ssl',
+                   deprecated_for_removal=True,
                    help='Path of the certfile for SSL. For non-production '
                         'environments, you may be interested in using '
                         '`keystone-manage ssl_setup` to generate self-signed '
@@ -1051,13 +1061,16 @@ FILE_OPTIONS = {
         cfg.StrOpt('keyfile',
                    default='/etc/keystone/ssl/private/keystonekey.pem',
                    deprecated_name='keyfile', deprecated_group='ssl',
+                   deprecated_for_removal=True,
                    help='Path of the keyfile for SSL.'),
         cfg.StrOpt('ca_certs',
                    default='/etc/keystone/ssl/certs/ca.pem',
                    deprecated_name='ca_certs', deprecated_group='ssl',
+                   deprecated_for_removal=True,
                    help='Path of the CA cert file for SSL.'),
         cfg.BoolOpt('cert_required', default=False,
                     deprecated_name='cert_required', deprecated_group='ssl',
+                    deprecated_for_removal=True,
                     help='Require client certificate.'),
     ],
 }