From f6ac0661bf5bbc11cf5ad958667dd901a0b865d1 Mon Sep 17 00:00:00 2001 From: nonameentername Date: Tue, 10 May 2016 10:15:00 -0500 Subject: [PATCH] Update documentation to remove keystone-all keystone-all command was removed but no alternative for running keystone in developer mode was added. Update documentation with uwsgi command and update keystone-all reference. Change-Id: Ia949620de21c1b05127769c6da249b38d83cda9c --- doc/source/configuration.rst | 11 ++++++++--- doc/source/developing.rst | 5 +++-- doc/source/federation/configure_federation.rst | 2 +- doc/source/installing.rst | 3 +-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 053b887510..1fcdd7edfa 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -1284,9 +1284,14 @@ You should now be ready to initialize your new database without error, using: $ keystone-manage db_sync -To test this, you should now be able to start ``keystone-all`` and use the -OpenStack Client to list your projects (which should successfully return an -empty list from your new database): +To test this, you should now be able to start keystone: + +.. code-block:: bash + + $ uwsgi --http 127.0.0.1:35357 --wsgi-file $(which keystone-wsgi-admin) + +And use the OpenStack Client to list your projects (which should successfully +return an empty list from your new database): .. code-block:: bash diff --git a/doc/source/developing.rst b/doc/source/developing.rst index 631159aca4..8ec05b8a5e 100644 --- a/doc/source/developing.rst +++ b/doc/source/developing.rst @@ -47,7 +47,7 @@ To run the Keystone Admin and API server instances, use: .. code-block:: bash - $ keystone-all + $ uwsgi --http 127.0.0.1:35357 --wsgi-file $(which keystone-wsgi-admin) This runs Keystone with the configuration the etc/ directory of the project. See :doc:`configuration` for details on how Keystone is configured. By default, @@ -564,7 +564,8 @@ This will generate .mo files like keystone/locale/[lang]/LC_MESSAGES/[lang].mo .. code-block:: bash - $ KEYSTONE_LOCALEDIR=/opt/stack/keystone/keystone/locale keystone-all + $ KEYSTONE_LOCALEDIR=/opt/stack/keystone/keystone/locale uwsgi --http 127.0.0.1:35357 --wsgi-file $(which keystone-wsgi-admin) + Now you can get a translated error response: diff --git a/doc/source/federation/configure_federation.rst b/doc/source/federation/configure_federation.rst index 53d28acfd2..3ddde48220 100644 --- a/doc/source/federation/configure_federation.rst +++ b/doc/source/federation/configure_federation.rst @@ -48,7 +48,7 @@ Ubuntu 12.04 and Apache 2.2.22. To enable federation, you'll need to: -1. Run keystone under Apache, rather than using ``keystone-all``. +1. Run keystone under Apache, rather than using uwsgi command. 2. Configure Apache to use a federation capable authentication method. 3. Configure ``federation`` in keystone. diff --git a/doc/source/installing.rst b/doc/source/installing.rst index b00ac6d29f..3180a01e12 100644 --- a/doc/source/installing.rst +++ b/doc/source/installing.rst @@ -63,7 +63,6 @@ system. The following commands should be available on the command-line path: * ``keystone`` the Keystone client, used to interact with Keystone * ``keystone-manage`` used to bootstrap Keystone data -* ``keystone-all`` used to run the Keystone services You will find sample configuration files in ``etc/``: @@ -79,7 +78,7 @@ the command: .. code-block:: bash - $ keystone-all + $ uwsgi --http 127.0.0.1:35357 --wsgi-file $(which keystone-wsgi-admin) By default, this will show logging on the console from which it was started. Once started, you can initialize data in Keystone for use with the rest of