diff options
| author |   asteroide <thomas.duval@orange.com> | 2015-09-01 16:03:26 +0200 |
|---|---|---|
| committer | asteroide <thomas.duval@orange.com> | 2015-09-01 16:04:53 +0200 |
| commit | 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 (patch) | |
| tree | 7ba22297042019e7363fa1d4ad26d1c32c5908c6 /keystone-moon/doc/source/extensions | |
| parent | 26e753254f3e43399cc76e62892908b7742415e8 (diff) | |
Update Keystone code from official Github repository with branch Master on 09/01/2015.
Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498
Diffstat (limited to 'keystone-moon/doc/source/extensions')
4 files changed, 4 insertions, 5 deletions
diff --git a/keystone-moon/doc/source/extensions/endpoint_filter.rst b/keystone-moon/doc/source/extensions/endpoint_filter.rst index 66198503..4ab194b8 100644 --- a/keystone-moon/doc/source/extensions/endpoint_filter.rst +++ b/keystone-moon/doc/source/extensions/endpoint_filter.rst @@ -24,7 +24,7 @@ To enable the endpoint filter extension: in ``keystone.conf``. For example:: [catalog] - driver = keystone.contrib.endpoint_filter.backends.catalog_sql.EndpointFilterCatalog + driver = catalog_sql 2. Add the ``endpoint_filter_extension`` filter to the ``api_v3`` pipeline in ``keystone-paste.ini``. This must be added after ``json_body`` and before diff --git a/keystone-moon/doc/source/extensions/endpoint_policy.rst b/keystone-moon/doc/source/extensions/endpoint_policy.rst index 86ff2264..ad403d50 100644 --- a/keystone-moon/doc/source/extensions/endpoint_policy.rst +++ b/keystone-moon/doc/source/extensions/endpoint_policy.rst @@ -21,7 +21,7 @@ To enable the endpoint policy extension: ``[endpoint_policy]`` section in ``keystone.conf``. For example:: [endpoint_policy] - driver = keystone.contrib.endpoint_policy.backends.sql.EndpointPolicy + driver = sql 2. Add the ``endpoint_policy_extension`` policy to the ``api_v3`` pipeline in ``keystone-paste.ini``. This must be added after ``json_body`` and before diff --git a/keystone-moon/doc/source/extensions/oauth1.rst b/keystone-moon/doc/source/extensions/oauth1.rst index c89ee126..29955d74 100644 --- a/keystone-moon/doc/source/extensions/oauth1.rst +++ b/keystone-moon/doc/source/extensions/oauth1.rst @@ -23,13 +23,12 @@ To enable the OAuth1 extension: 1. Optionally, add the oauth1 extension driver to the ``[oauth1]`` section in ``keystone.conf``. For example:: [oauth1] - driver = keystone.contrib.oauth1.backends.sql.OAuth1 + driver = sql 2. Add the ``oauth1`` authentication method to the ``[auth]`` section in ``keystone.conf``:: [auth] methods = external,password,token,oauth1 - oauth1 = keystone.auth.plugins.oauth1.OAuth 3. Add the ``oauth1_extension`` filter to the ``api_v3`` pipeline in ``keystone-paste.ini``. This must be added after ``json_body`` and before diff --git a/keystone-moon/doc/source/extensions/revoke.rst b/keystone-moon/doc/source/extensions/revoke.rst index e8a25ce9..a89e359d 100644 --- a/keystone-moon/doc/source/extensions/revoke.rst +++ b/keystone-moon/doc/source/extensions/revoke.rst @@ -27,7 +27,7 @@ Enabling the Revocation Extension in ``keystone.conf``. For example:: [revoke] - driver = keystone.contrib.revoke.backends.sql.Revoke + driver = sql 2. Add the required ``filter`` to the ``pipeline`` in ``keystone-paste.ini``. This must be added after ``json_body`` and before the last entry in the |