diff --git a/doc/common/section_identity-configure.xml b/doc/common/section_identity-configure.xml
deleted file mode 100644
index d06ad4e60b..0000000000
--- a/doc/common/section_identity-configure.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
- Identity Service configuration files
-
-
- keystone.conf
-
- The Identity Service
- /etc/keystone/keystone.conf
- configuration file is an INI-format file with
- sections.
- The [DEFAULT] section configures
- general configuration values.
- Specific sections, such as the [database]
- and [ec2] sections, configure individual
- services.
-
-
keystone.conf file sections
-
-
-
-
-
Section
-
Description
-
-
-
-
-
[DEFAULT]
-
General configuration.
-
-
-
[database]
-
Optional storage back-end configuration.
-
-
-
[ec2]
-
Amazon EC2 authentication driver configuration.
-
-
-
[s3]
-
Amazon S3 authentication driver configuration.
-
-
-
[identity]
-
Identity Service system driver configuration.
-
-
-
[catalog]
-
Service catalog driver configuration.
-
-
-
[token]
-
Token driver configuration.
-
-
-
[policy]
-
Policy system driver configuration for RBAC.
-
-
-
[signing]
-
Cryptographic signatures for PKI based tokens.
-
-
-
[ssl]
-
SSL configuration.
-
-
-
- When you start the Identity Service, you can use the
- --config-file parameter to specify
- a configuration file.
- If you do not specify a configuration file, the Identity
- Service looks for the keystone.conf
- configuration file in these directories in this
- order:
-
-
-
- ~/.keystone
-
-
-
-
- ~/
-
-
-
-
- /etc/keystone
-
-
-
-
- /etc
-
-
-
-
-
-
- keystone-paste.ini
-
- The
- /etc/keystone/keystone-paste.ini file
- configures the Identity Service WSGI middleware
- pipeline.
-
-
-
-
diff --git a/doc/config-reference/ch_computeconfigure.xml b/doc/config-reference/ch_computeconfigure.xml
index 31876c182d..91013b4b35 100644
--- a/doc/config-reference/ch_computeconfigure.xml
+++ b/doc/config-reference/ch_computeconfigure.xml
@@ -23,7 +23,7 @@
directory.
- Related Image Service and Identity Service management
+ Related Image Service and Identity service management
configuration files.
@@ -41,7 +41,7 @@
Configure authentication and authorizationThere are different methods of authentication for the
OpenStack Compute project, including no authentication. The
- preferred system is the OpenStack Identity Service, code-named
+ preferred system is the OpenStack Identity service, code-named
Keystone.To customize authorization settings for Compute, use the
configuration options documented in
diff --git a/doc/config-reference/ch_identityconfigure.xml b/doc/config-reference/ch_identityconfigure.xml
index 287eed05aa..3e26e4a61b 100644
--- a/doc/config-reference/ch_identityconfigure.xml
+++ b/doc/config-reference/ch_identityconfigure.xml
@@ -7,13 +7,55 @@
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
- Identity Service
- This chapter details the OpenStack Identity Service configuration
+ Identity service
+ This chapter details the OpenStack Identity service configuration
options. For installation prerequisites and step-by-step walkthroughs, see the
OpenStack Installation Guide for your distribution (docs.openstack.org) and Cloud
Administrator Guide.
-
-
+
+
+ Identity service configuration file
+ The Identity service is configured in the
+ /etc/keystone/keystone.conf file.
+ The following tables provide a comprehensive list of the Identity
+ service options.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml b/doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml
index cee952d6a9..004ad15a66 100644
--- a/doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml
+++ b/doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml
@@ -9,10 +9,10 @@
keystone_policy.jsonThe keystone_policy.json file
defines additional access controls for the dashboard that
- apply to the Identity Service.
+ apply to the Identity service.The keystone_policy.json file
- must match the Identity Service
+ must match the Identity service
/etc/keystone/policy.json
policy file.
diff --git a/doc/common/section_keystone-sample-conf-files.xml b/doc/config-reference/identity/section_keystone-sample-conf-files.xml
similarity index 93%
rename from doc/common/section_keystone-sample-conf-files.xml
rename to doc/config-reference/identity/section_keystone-sample-conf-files.xml
index 3c45bc604b..637bdb1252 100644
--- a/doc/common/section_keystone-sample-conf-files.xml
+++ b/doc/config-reference/identity/section_keystone-sample-conf-files.xml
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="sample-configuration-files">
- Identity Service sample configuration files
+ Identity service sample configuration filesAll the files in this section can be found in the /etc/keystone
directory.
@@ -19,7 +19,7 @@
keystone-paste.iniThe keystone-paste.ini file configures the
Web Service Gateway Interface (WSGI) middleware pipeline for
- the Identity Service.
+ the Identity service.
@@ -41,10 +41,10 @@
policy.jsonThe policy.json file defines additional access controls that
- apply to the Identity Service.
+ apply to the Identity service.
-
\ No newline at end of file
+
diff --git a/doc/config-reference/table_default-ports-primary-services.xml b/doc/config-reference/table_default-ports-primary-services.xml
index 40794fd39e..c5e48b815f 100644
--- a/doc/config-reference/table_default-ports-primary-services.xml
+++ b/doc/config-reference/table_default-ports-primary-services.xml
@@ -54,13 +54,13 @@
-
Identity Service (keystone)
+
Identity service (keystone)
administrative endpoint