Merge "Move identity sources doc to admin guide"

This commit is contained in:
Zuul 2018-12-13 03:19:15 +00:00 committed by Gerrit Code Review
commit 7880b3bb86
5 changed files with 5 additions and 15 deletions

View File

@ -1,5 +1,5 @@
..
Copyright 2011-2012 OpenStack Foundation
Copyright 2018 SUSE Linux GmbH
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
@ -31,6 +31,6 @@ Configuration`_ for an example). For example, you can store OpenStack service us
and their passwords in SQL, manage customers in LDAP, and authenticate employees
via SAML federation.
.. _Domain-specific Configuration: admin/domain-specific-config.html
.. _Domain-specific Configuration: domain-specific-config.html
.. support_matrix:: identity-support-matrix.ini

View File

@ -15,6 +15,7 @@ command-line client.
:maxdepth: 1
identity-concepts.rst
identity-sources.rst
bootstrap.rst
cli-manage-projects-users-and-roles.rst
cli-keystone-manage-services.rst

View File

@ -120,7 +120,7 @@ If there is a new external library (e.g. ``oslo.messaging``) that utilizes the
found in ``config-generator/keystone.conf``.
You can also generate sample policy files using ``tox -e genpolicy``. Please refer
to :doc:`../configuration` for guidance on specific configuration options or to
to :doc:`../configuration/config-options` for guidance on specific configuration options or to
view a sample paste file.
Bootstrapping a test deployment
@ -149,7 +149,7 @@ following uses ``uwsgi``:
$ uwsgi --http 127.0.0.1:5000 --wsgi-file $(which keystone-wsgi-public)
This runs Keystone with the configuration the etc/ directory of the project.
See :doc:`../configuration` for details on how Keystone is configured. By default,
See :doc:`../configuration/config-options` for details on how Keystone is configured. By default,
Keystone is configured with SQL backends.
Database setup

View File

@ -75,17 +75,6 @@ This section contains the documentation needed for developing keystone.
contributor/index.rst
Operator Documentation
~~~~~~~~~~~~~~~~~~~~~~
This section contains the documentation for deploying and operating the
keystone service.
.. toctree::
:maxdepth: 2
configuration.rst
User Documentation
~~~~~~~~~~~~~~~~~~