From 46b30535cf2fc6621372bdb8e8d15a3a77f0e31c Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 11 Dec 2018 11:56:19 +0100 Subject: [PATCH] Move identity sources doc to admin guide Move the identity sources support matrix to the administrator guide and clean up the remainder of the configuration page and the operator guide. Change-Id: If6978121873b6b4a5438164f082f359688477298 --- .../{configuration.rst => admin/identity-sources.rst} | 4 ++-- doc/source/{ => admin}/identity-support-matrix.ini | 0 doc/source/admin/index.rst | 1 + doc/source/contributor/set-up-keystone.rst | 4 ++-- doc/source/index.rst | 11 ----------- 5 files changed, 5 insertions(+), 15 deletions(-) rename doc/source/{configuration.rst => admin/identity-sources.rst} (91%) rename doc/source/{ => admin}/identity-support-matrix.ini (100%) diff --git a/doc/source/configuration.rst b/doc/source/admin/identity-sources.rst similarity index 91% rename from doc/source/configuration.rst rename to doc/source/admin/identity-sources.rst index ada6043dc1..16305a332b 100644 --- a/doc/source/configuration.rst +++ b/doc/source/admin/identity-sources.rst @@ -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 diff --git a/doc/source/identity-support-matrix.ini b/doc/source/admin/identity-support-matrix.ini similarity index 100% rename from doc/source/identity-support-matrix.ini rename to doc/source/admin/identity-support-matrix.ini diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index fe52debad8..423353fadf 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -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 diff --git a/doc/source/contributor/set-up-keystone.rst b/doc/source/contributor/set-up-keystone.rst index 9fc080725a..c29e940fe1 100644 --- a/doc/source/contributor/set-up-keystone.rst +++ b/doc/source/contributor/set-up-keystone.rst @@ -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 diff --git a/doc/source/index.rst b/doc/source/index.rst index 8bcab55b10..5efbf341e4 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -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 ~~~~~~~~~~~~~~~~~~