From b3c89e8c3f3d219841d2766184e3d06e72149788 Mon Sep 17 00:00:00 2001 From: Suramya Shah Date: Thu, 22 Feb 2018 23:11:56 +0530 Subject: [PATCH] Consolidate Keystone docs: admin/identity-external-authentication.rst Consolidate advanced-topics/external-auth.rst into admin/identity-external-authentication.rst. Change-Id: Ic4e9c37f41c4998fbdfe4b21c7b57b2de4776432 --- .../identity-external-authentication.rst} | 0 doc/source/admin/index.rst | 1 + doc/source/advanced-topics/index.rst | 1 - doc/source/contributor/auth-plugins.rst | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename doc/source/{advanced-topics/external-auth.rst => admin/identity-external-authentication.rst} (100%) diff --git a/doc/source/advanced-topics/external-auth.rst b/doc/source/admin/identity-external-authentication.rst similarity index 100% rename from doc/source/advanced-topics/external-auth.rst rename to doc/source/admin/identity-external-authentication.rst diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index ae342932f1..9b58cf38ce 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -45,6 +45,7 @@ command-line client. endpoint-policy.rst event_notifications.rst auth-totp.rst + identity-external-authentication.rst .. toctree:: :maxdepth: 2 diff --git a/doc/source/advanced-topics/index.rst b/doc/source/advanced-topics/index.rst index 07bf66a742..ddd7c7352b 100644 --- a/doc/source/advanced-topics/index.rst +++ b/doc/source/advanced-topics/index.rst @@ -6,4 +6,3 @@ Advanced Topics :maxdepth: 1 configure_tokenless_x509.rst - external-auth.rst diff --git a/doc/source/contributor/auth-plugins.rst b/doc/source/contributor/auth-plugins.rst index 8f0f7a16ea..52ff50766b 100644 --- a/doc/source/contributor/auth-plugins.rst +++ b/doc/source/contributor/auth-plugins.rst @@ -34,7 +34,7 @@ password authentication and ``token`` handles token authentication. ``external`` is used in conjunction with authentication performed by a container web server that sets the ``REMOTE_USER`` environment variable. For more details, refer to :doc:`External Authentication -<../advanced-topics/external-auth>`. +<../admin/identity-external-authentication>`. How to Implement an Authentication Plugin ----------------------------------------- @@ -81,5 +81,5 @@ webserver. However, to ensure that a user must go through other authentication mechanisms, even if this variable is set, remove ``external`` from the list of plugins specified in ``methods``. This effectively disables external authentication. For more details, refer to :doc:`External Authentication -<../advanced-topics/external-auth>`. +<../admin/identity-external-authentication>`.