Merge "[Doc] Remove description about v1 api and glance-registry"

Author: Zuul

doc/source/admin/authentication.rst

@@ -33,16 +33,13 @@ Configuring the Glance servers to use Keystone
 ----------------------------------------------
 
 Keystone is integrated with Glance through the use of middleware. The
-default configuration files for both the Glance API and the Glance
-Registry use a single piece of middleware called ``unauthenticated-context``,
-which generates a request context containing blank authentication
-information. In order to configure Glance to use Keystone, the
-``authtoken`` and ``context`` middlewares must be deployed in place of the
-``unauthenticated-context`` middleware. The ``authtoken`` middleware performs
-the authentication token validation and retrieves actual user authentication
-information. It can be found in the Keystone distribution.
-
-.. include:: ../deprecate-registry.inc
+default configuration file for the Glance API uses a single piece of middleware
+called ``unauthenticated-context``, which generates a request context
+containing blank authentication information. In order to configure Glance to
+use Keystone, the ``authtoken`` and ``context`` middlewares must be deployed in
+place of the ``unauthenticated-context`` middleware. The ``authtoken``
+middleware performs the authentication token validation and retrieves actual
+user authentication information. It can be found in the Keystone distribution.
 
 
 Configuring Glance API to use Keystone
@@ -90,27 +87,3 @@ with ``authtoken`` and ``context``::
 
   [pipeline:glance-api]
   pipeline = versionnegotiation authtoken context apiv1app
-
-
-Configuring Glance Registry to use Keystone
--------------------------------------------
-
-.. include:: ../deprecate-registry.inc
-
-Configuring Glance Registry to use Keystone is also relatively
-straight forward.  The same middleware needs to be added
-to ``glance-registry-paste.ini`` as was needed by Glance API;
-see above for an example of the ``authtoken`` configuration.
-
-Again, to enable using Keystone authentication, the appropriate
-application pipeline must be selected.  By default, it looks like::
-
-  [pipeline:glance-registry-keystone]
-  pipeline = authtoken context registryapp
-
-To enable the above application pipeline, in your main ``glance-registry.conf``
-configuration file, select the appropriate deployment flavor by adding a
-``flavor`` attribute in the ``paste_deploy`` group::
-
-  [paste_deploy]
-  flavor = keystone

doc/source/admin/cache.rst

@@ -74,7 +74,6 @@ correctly.
   store, points to where the data is kept.
 - ``filesystem_store_datadirs`` This is used to point to multiple
   filesystem stores.
-- ``registry_host`` The URL to the Glance registry.
 - ``cache_prefetcher_interval`` The interval in seconds to run periodic
   job 'cache_images'.
 

doc/source/admin/controllingservers.rst

@@ -22,9 +22,6 @@ Controlling Glance Servers
 This section describes the ways to start, stop, and reload Glance's server
 programs.
 
-.. include:: ../deprecate-registry.inc
-
-
 Starting a server
 -----------------
 
@@ -80,8 +77,6 @@ in a shell.::
   2011-04-13 14:50:12    DEBUG [glance-api] debug                          True
   2011-04-13 14:50:12    DEBUG [glance-api] default_store                  file
   2011-04-13 14:50:12    DEBUG [glance-api] filesystem_store_datadir       /home/jsuh/images/
-  2011-04-13 14:50:12    DEBUG [glance-api] registry_host                  65.114.169.29
-  2011-04-13 14:50:12    DEBUG [glance-api] registry_port                  9191
   2011-04-13 14:50:12    DEBUG [glance-api] ********************************************************************************
   2011-04-13 14:50:12    DEBUG [routes.middleware] Initialized with method overriding = True, and path info altering = True
   2011-04-13 14:50:12    DEBUG [eventlet.wsgi.server] (21354) wsgi starting up on http://65.114.169.29:9292/

doc/source/admin/property-protections.rst

@@ -98,57 +98,3 @@ operations.
 
 A successful HTTP request will return status ``200 OK``. If the user is not
 permitted to perform the requested action, ``403 Forbidden`` will be returned.
-
-V1 API X-glance-registry-Purge-props
-------------------------------------
-
-.. include:: ../deprecate-registry.inc
-
-Property protections will still be honoured if
-``X-glance-registry-Purge-props`` is set to ``True``. That is, if you request
-to modify properties with this header set to ``True``, you will not be able to
-delete or update properties for which you do not have the relevant permissions.
-Properties which are not included in the request and for which you do have
-delete permissions will still be removed.
-
-Examples
---------
-
-**Example 1**. Limit all property interactions to admin only.
-
-::
-
-  [.*]
-  create = admin
-  read = admin
-  update = admin
-  delete = admin
-
-**Example 2**. Allow both admins and users with the billing role to read
-and modify properties prefixed with ``x_billing_code_``. Allow admins to
-read and modify any properties.
-
-::
-
-  [^x_billing_code_.*]
-  create = admin,billing
-  read = admin, billing
-  update = admin,billing
-  delete = admin,billing
-
-  [.*]
-  create = admin
-  read = admin
-  update = admin
-  delete = admin
-
-**Example 3**. Limit all property interactions to admin only using policy
-rule context_is_admin defined in policy.json.
-
-::
-
-  [.*]
-  create = context_is_admin
-  read = context_is_admin
-  update = context_is_admin
-  delete = context_is_admin