From 6f0750334de19a05c1af330dd3949f5a58723711 Mon Sep 17 00:00:00 2001 From: "zhu.rong" Date: Fri, 2 Oct 2015 21:44:20 +0800 Subject: [PATCH] [admin-guide-cloud]Fix the keystone wrong config path keystone_configure_with_SSL.rst and identity_management.rst use the /etc/keystone.conf as config path, the config path should /etc/keystone/keystone.conf Change-Id: Icdb399854437628691376f0713d81ac80942796a Closes-bug: #1502150 --- doc/admin-guide-cloud/source/identity_management.rst | 7 ++++--- .../source/keystone_configure_with_SSL.rst | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/admin-guide-cloud/source/identity_management.rst b/doc/admin-guide-cloud/source/identity_management.rst index 04e2c9899d..378535f1ba 100644 --- a/doc/admin-guide-cloud/source/identity_management.rst +++ b/doc/admin-guide-cloud/source/identity_management.rst @@ -6,9 +6,10 @@ Identity management OpenStack Identity, code-named keystone, is the default identity management system for OpenStack. After you install Identity, you -configure it through the :file:`/etc/keystone.conf` configuration file and, -possibly, a separate logging configuration file. You initialize data -into Identity by using the ``keystone`` command-line client. +configure it through the :file:`/etc/keystone/keystone.conf` +configuration file and, possibly, a separate logging configuration +file. You initialize data into Identity by using the ``keystone`` +command-line client. .. toctree:: :maxdepth: 1 diff --git a/doc/admin-guide-cloud/source/keystone_configure_with_SSL.rst b/doc/admin-guide-cloud/source/keystone_configure_with_SSL.rst index 7eed8ae2b7..725c30c39c 100644 --- a/doc/admin-guide-cloud/source/keystone_configure_with_SSL.rst +++ b/doc/admin-guide-cloud/source/keystone_configure_with_SSL.rst @@ -36,8 +36,8 @@ Client authentication with keystone-all When running ``keystone-all``, the server can be configured to enable SSL with client authentication using the following instructions. Modify the -``[eventlet_server_ssl]`` section in the :file:`/etc/keystone.conf` file. The -following SSL configuration example uses the included sample +``[eventlet_server_ssl]`` section in the :file:`/etc/keystone/keystone.conf` +file. The following SSL configuration example uses the included sample certificates: .. code-block:: ini