From 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 Mon Sep 17 00:00:00 2001 From: asteroide Date: Tue, 1 Sep 2015 16:03:26 +0200 Subject: Update Keystone code from official Github repository with branch Master on 09/01/2015. Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498 --- keystone-moon/doc/source/external-auth.rst | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'keystone-moon/doc/source/external-auth.rst') diff --git a/keystone-moon/doc/source/external-auth.rst b/keystone-moon/doc/source/external-auth.rst index 5f3c9af8..4b545e4f 100644 --- a/keystone-moon/doc/source/external-auth.rst +++ b/keystone-moon/doc/source/external-auth.rst @@ -28,15 +28,14 @@ To configure the plugin that should be used set the ``external`` option again in the ``auth`` section. There are two external authentication method plugins provided by Keystone: -* ``keystone.auth.plugins.external.Default``: This plugin won't take into - account the domain information that the external authentication method may - pass down to Keystone and will always use the configured default domain. The - ``REMOTE_USER`` variable is the username. - -* ``keystone.auth.plugins.external.Domain``: This plugin expects that the - ``REMOTE_DOMAIN`` variable contains the domain for the user. If this variable - is not present, the configured default domain will be used. The - ``REMOTE_USER`` variable is the username. +* ``DefaultDomain``: This plugin won't take into account the domain information + that the external authentication method may pass down to Keystone and will + always use the configured default domain. The ``REMOTE_USER`` variable is the + username. This is the default if no plugin is given. + +* ``Domain``: This plugin expects that the ``REMOTE_DOMAIN`` variable contains + the domain for the user. If this variable is not present, the configured + default domain will be used. The ``REMOTE_USER`` variable is the username. Using HTTPD authentication ========================== -- cgit 1.2.3-korg