From 2ca23844b5bc2102ab243d67e8ebabf35d014f26 Mon Sep 17 00:00:00 2001 From: Rodrigo Duarte Sousa Date: Tue, 3 Mar 2015 15:12:20 -0300 Subject: [PATCH] Fix nits from 157495 Use keystone instead of Keystone (according to OpenStack naming conventions: https://wiki.openstack.org/wiki/Documentation/Conventions). Change-Id: I2e6229d08b36f87e35bed2845121bdf4a71792fe --- doc/source/configuration.rst | 4 ++-- keystone/server/eventlet.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 35aac2e739..c248a6c9a2 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -50,9 +50,9 @@ Starting and Stopping Keystone under Eventlet .. WARNING:: - Running Keystone under eventlet has been deprecated as of the Kilo release. + Running keystone under eventlet has been deprecated as of the Kilo release. Support for utilizing eventlet will be removed as of the M-release. The - recommended deployment is to run Keystone in a WSGI server + recommended deployment is to run keystone in a WSGI server (e.g. ``mod_wsgi`` under ``HTTPD``). Keystone can be run using either its built-in eventlet server or it can be run diff --git a/keystone/server/eventlet.py b/keystone/server/eventlet.py index 00f5317004..5bedaf9b0e 100644 --- a/keystone/server/eventlet.py +++ b/keystone/server/eventlet.py @@ -74,9 +74,9 @@ def create_server(conf, name, host, port, workers): def serve(*servers): - logging.warning(_('Running Keystone via eventlet is deprecated as of Kilo ' + logging.warning(_('Running keystone via eventlet is deprecated as of Kilo ' 'in favor of running in a WSGI server (e.g. mod_wsgi). ' - 'Support for Keystone under eventlet will be removed in ' + 'Support for keystone under eventlet will be removed in ' 'the "M"-Release.')) if max([server[1].workers for server in servers]) > 1: launcher = service.ProcessLauncher()