From 34d6335672f137d82c1c8465dbfc14bcb878fc4e Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Wed, 22 Aug 2012 20:00:14 -0700 Subject: [PATCH] Remove repeated image-sharing docs * Drop image sharing blurb from authentication docs. * Link to authentication page from api page Related to bp glance-folsom-docs-cleanup Change-Id: Idac46a78f79fac0c673f6a9b91c1f44df7b705b4 --- doc/source/authentication.rst | 12 ------------ doc/source/glanceapi.rst | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/source/authentication.rst b/doc/source/authentication.rst index 0af8f9f560..71120c5538 100644 --- a/doc/source/authentication.rst +++ b/doc/source/authentication.rst @@ -117,18 +117,6 @@ configuration file, select the appropriate deployment flavor by adding a in the ``admin_role`` config attribute in both ``glance-registry.conf`` and ``glance-api.conf``. -Sharing Images With Others --------------------------- - -It is possible to allow a private image to be shared with one or more -alternate tenants. This is done through image *memberships*, which -are available via the `members` resource of images. (For more -details, see :doc:`glanceapi`.) Essentially, a membership is an -association between an image and a tenant which has permission to -access that image. These membership associations may also have a -`can_share` attribute, which, if set to `true`, delegates the -authority to share an image to the named tenant. - Configuring the Glance Client to use Keystone --------------------------------------------- diff --git a/doc/source/glanceapi.rst b/doc/source/glanceapi.rst index 63a901f9bd..c68411ded4 100644 --- a/doc/source/glanceapi.rst +++ b/doc/source/glanceapi.rst @@ -30,6 +30,8 @@ Keystone using and send it along with all API requests to Glance through the ``X-Auth-Token`` header. Glance will communicate back to Keystone to verify the token validity and obtain your identity credentials. +See :doc:`authentication` for more information on integrating with Keystone. + Using v1.X ----------