Skip to content

Commit 81c6d4d

Browse files
committed
[Doc] Remove description about v1 api and glance-registry
Image v1 API and glance-registry has been removed from Glance. This patch removes all descriptions about these 2 items, since they are no longer available. Change-Id: Ic72921523f73dcae5e9c443a55edecb710b2d251
1 parent f102b74 commit 81c6d4d

File tree

9 files changed

+39
-343
lines changed

9 files changed

+39
-343
lines changed

doc/source/admin/authentication.rst

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,13 @@ Configuring the Glance servers to use Keystone
3333
----------------------------------------------
3434

3535
Keystone is integrated with Glance through the use of middleware. The
36-
default configuration files for both the Glance API and the Glance
37-
Registry use a single piece of middleware called ``unauthenticated-context``,
38-
which generates a request context containing blank authentication
39-
information. In order to configure Glance to use Keystone, the
40-
``authtoken`` and ``context`` middlewares must be deployed in place of the
41-
``unauthenticated-context`` middleware. The ``authtoken`` middleware performs
42-
the authentication token validation and retrieves actual user authentication
43-
information. It can be found in the Keystone distribution.
44-
45-
.. include:: ../deprecate-registry.inc
36+
default configuration file for the Glance API uses a single piece of middleware
37+
called ``unauthenticated-context``, which generates a request context
38+
containing blank authentication information. In order to configure Glance to
39+
use Keystone, the ``authtoken`` and ``context`` middlewares must be deployed in
40+
place of the ``unauthenticated-context`` middleware. The ``authtoken``
41+
middleware performs the authentication token validation and retrieves actual
42+
user authentication information. It can be found in the Keystone distribution.
4643

4744

4845
Configuring Glance API to use Keystone
@@ -90,27 +87,3 @@ with ``authtoken`` and ``context``::
9087

9188
[pipeline:glance-api]
9289
pipeline = versionnegotiation authtoken context apiv1app
93-
94-
95-
Configuring Glance Registry to use Keystone
96-
-------------------------------------------
97-
98-
.. include:: ../deprecate-registry.inc
99-
100-
Configuring Glance Registry to use Keystone is also relatively
101-
straight forward. The same middleware needs to be added
102-
to ``glance-registry-paste.ini`` as was needed by Glance API;
103-
see above for an example of the ``authtoken`` configuration.
104-
105-
Again, to enable using Keystone authentication, the appropriate
106-
application pipeline must be selected. By default, it looks like::
107-
108-
[pipeline:glance-registry-keystone]
109-
pipeline = authtoken context registryapp
110-
111-
To enable the above application pipeline, in your main ``glance-registry.conf``
112-
configuration file, select the appropriate deployment flavor by adding a
113-
``flavor`` attribute in the ``paste_deploy`` group::
114-
115-
[paste_deploy]
116-
flavor = keystone

doc/source/admin/cache.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ correctly.
7474
store, points to where the data is kept.
7575
- ``filesystem_store_datadirs`` This is used to point to multiple
7676
filesystem stores.
77-
- ``registry_host`` The URL to the Glance registry.
7877
- ``cache_prefetcher_interval`` The interval in seconds to run periodic
7978
job 'cache_images'.
8079

doc/source/admin/controllingservers.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ Controlling Glance Servers
2222
This section describes the ways to start, stop, and reload Glance's server
2323
programs.
2424

25-
.. include:: ../deprecate-registry.inc
26-
27-
2825
Starting a server
2926
-----------------
3027

@@ -80,8 +77,6 @@ in a shell.::
8077
2011-04-13 14:50:12 DEBUG [glance-api] debug True
8178
2011-04-13 14:50:12 DEBUG [glance-api] default_store file
8279
2011-04-13 14:50:12 DEBUG [glance-api] filesystem_store_datadir /home/jsuh/images/
83-
2011-04-13 14:50:12 DEBUG [glance-api] registry_host 65.114.169.29
84-
2011-04-13 14:50:12 DEBUG [glance-api] registry_port 9191
8580
2011-04-13 14:50:12 DEBUG [glance-api] ********************************************************************************
8681
2011-04-13 14:50:12 DEBUG [routes.middleware] Initialized with method overriding = True, and path info altering = True
8782
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

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -98,57 +98,3 @@ operations.
9898

9999
A successful HTTP request will return status ``200 OK``. If the user is not
100100
permitted to perform the requested action, ``403 Forbidden`` will be returned.
101-
102-
V1 API X-glance-registry-Purge-props
103-
------------------------------------
104-
105-
.. include:: ../deprecate-registry.inc
106-
107-
Property protections will still be honoured if
108-
``X-glance-registry-Purge-props`` is set to ``True``. That is, if you request
109-
to modify properties with this header set to ``True``, you will not be able to
110-
delete or update properties for which you do not have the relevant permissions.
111-
Properties which are not included in the request and for which you do have
112-
delete permissions will still be removed.
113-
114-
Examples
115-
--------
116-
117-
**Example 1**. Limit all property interactions to admin only.
118-
119-
::
120-
121-
[.*]
122-
create = admin
123-
read = admin
124-
update = admin
125-
delete = admin
126-
127-
**Example 2**. Allow both admins and users with the billing role to read
128-
and modify properties prefixed with ``x_billing_code_``. Allow admins to
129-
read and modify any properties.
130-
131-
::
132-
133-
[^x_billing_code_.*]
134-
create = admin,billing
135-
read = admin, billing
136-
update = admin,billing
137-
delete = admin,billing
138-
139-
[.*]
140-
create = admin
141-
read = admin
142-
update = admin
143-
delete = admin
144-
145-
**Example 3**. Limit all property interactions to admin only using policy
146-
rule context_is_admin defined in policy.json.
147-
148-
::
149-
150-
[.*]
151-
create = context_is_admin
152-
read = context_is_admin
153-
update = context_is_admin
154-
delete = context_is_admin

0 commit comments

Comments
 (0)