瀏覽代碼

Remove all example configs for deprecated registry

Including removal if the example conf in docs.

Change-Id: I00c77b8f7001d8fa0fde4083c2ee88c370c14a09
changes/35/707635/5
Erno Kuvaja 1 月之前
父節點
當前提交
2a28696de9
共有 10 個檔案被更改,包括 15 行新增2039 行删除
  1. +14
    -50
      doc/source/admin/controllingservers.rst
  2. +1
    -1
      doc/source/cli/glancemanage.rst
  3. +0
    -40
      doc/source/cli/glanceregistry.rst
  4. +0
    -4
      doc/source/conf.py
  5. +0
    -13
      doc/source/configuration/glance_registry.rst
  6. +0
    -9
      doc/source/configuration/sample-configuration.rst
  7. +0
    -35
      etc/glance-registry-paste.ini
  8. +0
    -1875
      etc/glance-registry.conf
  9. +0
    -10
      etc/oslo-config-generator/glance-registry.conf
  10. +0
    -2
      setup.cfg

+ 14
- 50
doc/source/admin/controllingservers.rst 查看文件

@@ -28,8 +28,7 @@ programs.
Starting a server
-----------------

There are two ways to start a Glance server (either the API server or the
registry server):
There are two ways to start a Glance server:

* Manually calling the server program

@@ -61,8 +60,7 @@ following directories, stopping at the first config file it finds:
* ``/etc``

The filename that is searched for depends on the server application name. So,
if you are starting up the API server, ``glance-api.conf`` is searched for,
otherwise ``glance-registry.conf``.
if you are starting up the API server, ``glance-api.conf`` is searched for.

If no configuration file is found, you will see an error, like::

@@ -70,7 +68,7 @@ If no configuration file is found, you will see an error, like::
ERROR: Unable to locate any configuration file. Cannot load application glance-api

Here is an example showing how you can manually start the ``glance-api`` server
and ``glance-registry`` in a shell.::
in a shell.::

$ sudo glance-api --config-file glance-api.conf --debug &
jsuh@mc-ats1:~$ 2011-04-13 14:50:12 DEBUG [glance-api] ********************************************************************************
@@ -88,46 +86,16 @@ and ``glance-registry`` in a shell.::
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/

$ sudo glance-registry --config-file glance-registry.conf &
jsuh@mc-ats1:~$ 2011-04-13 14:51:16 INFO [sqlalchemy.engine.base.Engine.0x...feac] PRAGMA table_info("images")
2011-04-13 14:51:16 INFO [sqlalchemy.engine.base.Engine.0x...feac] ()
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Col ('cid', 'name', 'type', 'notnull', 'dflt_value', 'pk')
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (0, u'created_at', u'DATETIME', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (1, u'updated_at', u'DATETIME', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (2, u'deleted_at', u'DATETIME', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (3, u'deleted', u'BOOLEAN', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (4, u'id', u'INTEGER', 1, None, 1)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (5, u'name', u'VARCHAR(255)', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (6, u'disk_format', u'VARCHAR(20)', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (7, u'container_format', u'VARCHAR(20)', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (8, u'size', u'INTEGER', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (9, u'status', u'VARCHAR(30)', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (10, u'is_public', u'BOOLEAN', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (11, u'location', u'TEXT', 0, None, 0)
2011-04-13 14:51:16 INFO [sqlalchemy.engine.base.Engine.0x...feac] PRAGMA table_info("image_properties")
2011-04-13 14:51:16 INFO [sqlalchemy.engine.base.Engine.0x...feac] ()
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Col ('cid', 'name', 'type', 'notnull', 'dflt_value', 'pk')
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (0, u'created_at', u'DATETIME', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (1, u'updated_at', u'DATETIME', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (2, u'deleted_at', u'DATETIME', 0, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (3, u'deleted', u'BOOLEAN', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (4, u'id', u'INTEGER', 1, None, 1)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (5, u'image_id', u'INTEGER', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (6, u'key', u'VARCHAR(255)', 1, None, 0)
2011-04-13 14:51:16 DEBUG [sqlalchemy.engine.base.Engine.0x...feac] Row (7, u'value', u'TEXT', 0, None, 0)

$ ps aux | grep glance
root 20009 0.7 0.1 12744 9148 pts/1 S 12:47 0:00 /usr/bin/python /usr/bin/glance-api glance-api.conf --debug
root 20012 2.0 0.1 25188 13356 pts/1 S 12:47 0:00 /usr/bin/python /usr/bin/glance-registry glance-registry.conf
jsuh 20017 0.0 0.0 3368 744 pts/1 S+ 12:47 0:00 grep glance

Simply supply the configuration file as the parameter to the ``--config-file``
option (the ``etc/glance-api.conf`` and ``etc/glance-registry.conf`` sample
configuration files were used in the above example) and then any other options
you want to use. (``--debug`` was used above to show some of the debugging
output that the server shows when starting up. Call the server program
with ``--help`` to see all available options you can specify on the
command line.)
option (the ``etc/glance-api.conf`` sample configuration file was used in the
above example) and then any other options you want to use. (``--debug`` was
used above to show some of the debugging output that the server shows when
starting up. Call the server program with ``--help`` to see all available
options you can specify on the command line.)

For more information on configuring the server via the ``paste.deploy``
configuration files, see the section entitled
@@ -162,19 +130,15 @@ with ``glance-control`` in the following way::
You must use the ``sudo`` program to run ``glance-control`` currently, as the
pid files for the server programs are written to /var/run/glance/

Here is an example that shows how to start the ``glance-registry`` server
Here is an example that shows how to start the ``glance-api`` server
with the ``glance-control`` wrapper script. ::


$ sudo glance-control api start glance-api.conf
Starting glance-api with /home/jsuh/glance.conf

$ sudo glance-control registry start glance-registry.conf
Starting glance-registry with /home/jsuh/glance.conf

$ ps aux | grep glance
root 20038 4.0 0.1 12728 9116 ? Ss 12:51 0:00 /usr/bin/python /usr/bin/glance-api /home/jsuh/glance-api.conf
root 20039 6.0 0.1 25188 13356 ? Ss 12:51 0:00 /usr/bin/python /usr/bin/glance-registry /home/jsuh/glance-registry.conf
jsuh 20042 0.0 0.0 3368 744 pts/1 S+ 12:51 0:00 grep glance


@@ -218,8 +182,8 @@ use the ``glance-control`` program to stop it. Simply do the following::

as this example shows::

$ sudo glance-control registry stop
Stopping glance-registry pid: 17602 signal: 15
$ sudo glance-control api stop
Stopping glance-api pid: 17602 signal: 15

Restarting a server
-------------------
@@ -227,9 +191,9 @@ Restarting a server
You can restart a server with the ``glance-control`` program, as demonstrated
here::

$ sudo glance-control registry restart etc/glance-registry.conf
Stopping glance-registry pid: 17611 signal: 15
Starting glance-registry with /home/jpipes/repos/glance/trunk/etc/glance-registry.conf
$ sudo glance-control api restart etc/glance-api.conf
Stopping glance-api pid: 17611 signal: 15
Starting glance-api with /home/jpipes/repos/glance/trunk/etc/glance-api.conf

Reloading a server
------------------


+ 1
- 1
doc/source/cli/glancemanage.rst 查看文件

@@ -103,4 +103,4 @@ following order:
* ``/etc``

All options set in ``glance-manage.conf`` override those set in
``glance-registry.conf`` and ``glance-api.conf``.
``glance-api.conf``.

+ 0
- 40
doc/source/cli/glanceregistry.rst 查看文件

@@ -1,40 +0,0 @@
===============
glance-registry
===============

--------------------------------------
Server for the Glance Registry Service
--------------------------------------

.. include:: header.txt

.. include:: ../deprecate-registry.inc


SYNOPSIS
========

::

glance-registry [options]

DESCRIPTION
===========

glance-registry is a server daemon that serves image metadata through a
REST-like API.

OPTIONS
=======

**General options**

.. include:: general_options.txt

FILES
=====

**/etc/glance/glance-registry.conf**
Default configuration file for Glance Registry

.. include:: footer.txt

+ 0
- 4
doc/source/conf.py 查看文件

@@ -75,8 +75,6 @@ config_generator_config_file = [
'_static/glance-cache'),
('../../etc/oslo-config-generator/glance-manage.conf',
'_static/glance-manage'),
('../../etc/oslo-config-generator/glance-registry.conf',
'_static/glance-registry'),
('../../etc/oslo-config-generator/glance-scrubber.conf',
'_static/glance-scrubber'),
]
@@ -163,8 +161,6 @@ man_pages = [
[u'OpenStack'], 1),
('cli/glancemanage', 'glance-manage', u'Glance Management Utility',
[u'OpenStack'], 1),
('cli/glanceregistry', 'glance-registry', u'Glance Registry Server',
[u'OpenStack'], 1),
('cli/glancereplicator', 'glance-replicator', u'Glance Replicator',
[u'OpenStack'], 1),
('cli/glancescrubber', 'glance-scrubber', u'Glance Scrubber Service',


+ 0
- 13
doc/source/configuration/glance_registry.rst 查看文件

@@ -1,13 +0,0 @@
.. _glance-registry.conf:

--------------------
glance-registry.conf
--------------------

.. include:: ../deprecate-registry.inc

This configuration file controls how the register server operates. More
information can be found in :ref:`configuring-the-glance-registry`.

.. show-options::
:config-file: etc/oslo-config-generator/glance-registry.conf

+ 0
- 9
doc/source/configuration/sample-configuration.rst 查看文件

@@ -18,15 +18,6 @@ This sample configuration can also be viewed in `glance-api.conf.sample
.. literalinclude:: ../_static/glance-api.conf.sample


Sample configuration for Glance Registry
----------------------------------------

This sample configuration can also be viewed in `glance-registry.conf.sample
<../_static/glance-registry.conf.sample>`_.

.. literalinclude:: ../_static/glance-registry.conf.sample


Sample configuration for Glance Scrubber
----------------------------------------



+ 0
- 35
etc/glance-registry-paste.ini 查看文件

@@ -1,35 +0,0 @@
# Use this pipeline for no auth - DEFAULT
[pipeline:glance-registry]
pipeline = healthcheck osprofiler unauthenticated-context registryapp

# Use this pipeline for keystone auth
[pipeline:glance-registry-keystone]
pipeline = healthcheck osprofiler authtoken context registryapp

# Use this pipeline for authZ only. This means that the registry will treat a
# user as authenticated without making requests to keystone to reauthenticate
# the user.
[pipeline:glance-registry-trusted-auth]
pipeline = healthcheck osprofiler context registryapp

[app:registryapp]
paste.app_factory = glance.registry.api:API.factory

[filter:healthcheck]
paste.filter_factory = oslo_middleware:Healthcheck.factory
backends = disable_by_file
disable_by_file_path = /etc/glance/healthcheck_disable

[filter:context]
paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory

[filter:unauthenticated-context]
paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory

[filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory

[filter:osprofiler]
paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
hmac_keys = SECRET_KEY #DEPRECATED
enabled = yes #DEPRECATED

+ 0
- 1875
etc/glance-registry.conf
文件差異過大導致無法顯示
查看文件


+ 0
- 10
etc/oslo-config-generator/glance-registry.conf 查看文件

@@ -1,10 +0,0 @@
[DEFAULT]
wrap_width = 80
output_file = etc/glance-registry.conf.sample
namespace = glance.registry
namespace = oslo.messaging
namespace = oslo.db
namespace = oslo.db.concurrency
namespace = oslo.policy
namespace = keystonemiddleware.auth_token
namespace = oslo.log

+ 0
- 2
setup.cfg 查看文件

@@ -23,10 +23,8 @@ data_files =
etc/glance-api.conf
etc/glance-cache.conf
etc/glance-manage.conf
etc/glance-registry.conf
etc/glance-scrubber.conf
etc/glance-api-paste.ini
etc/glance-registry-paste.ini
etc/policy.json
etc/glance/metadefs = etc/metadefs/*
packages =


Loading…
取消
儲存