Merge "Add headings for glance, keystone"

This commit is contained in:
Jenkins 2014-08-28 23:05:42 +00:00 committed by Gerrit Code Review
commit f77849fa52
63 changed files with 100 additions and 60 deletions

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_amqp">
<caption>Description of configuration options for amqp</caption>
<caption>Description of AMQP configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_api">
<caption>Description of configuration options for api</caption>
<caption>Description of API configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_auth_token">
<caption>Description of configuration options for auth_token</caption>
<caption>Description of authorization token configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_cinder">
<caption>Description of configuration options for cinder</caption>
<caption>Description of cinder configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_common">
<caption>Description of configuration options for common</caption>
<caption>Description of common configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_database">
<caption>Description of configuration options for database</caption>
<caption>Description of database configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_filesystem">
<caption>Description of configuration options for filesystem</caption>
<caption>Description of filesystem configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_gridfs">
<caption>Description of configuration options for gridfs</caption>
<caption>Description of GridFS configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_imagecache">
<caption>Description of configuration options for imagecache</caption>
<caption>Description of flagmappings configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_logging">
<caption>Description of configuration options for logging</caption>
<caption>Description of logging configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_matchmaker">
<caption>Description of configuration options for matchmaker</caption>
<caption>Description of matchmaker configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_paste">
<caption>Description of configuration options for paste</caption>
<caption>Description of paste configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_policy">
<caption>Description of configuration options for policy</caption>
<caption>Description of policy configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_profiler">
<caption>Description of configuration options for profiler</caption>
<caption>Description of profiler configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_qpid">
<caption>Description of configuration options for qpid</caption>
<caption>Description of Qpid configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_rabbitmq">
<caption>Description of configuration options for rabbitmq</caption>
<caption>Description of RabbitMQ configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_rbd">
<caption>Description of configuration options for rbd</caption>
<caption>Description of RBD configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_redis">
<caption>Description of configuration options for redis</caption>
<caption>Description of Redis configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_registry">
<caption>Description of configuration options for registry</caption>
<caption>Description of registry configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_rpc">
<caption>Description of configuration options for rpc</caption>
<caption>Description of RPC configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_s3">
<caption>Description of configuration options for s3</caption>
<caption>Description of S3 configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_sheepdog">
<caption>Description of configuration options for sheepdog</caption>
<caption>Description of Sheepdog configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_ssl">
<caption>Description of configuration options for ssl</caption>
<caption>Description of SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_swift">
<caption>Description of configuration options for swift</caption>
<caption>Description of swift configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_testing">
<caption>Description of configuration options for testing</caption>
<caption>Description of testing configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_vmware">
<caption>Description of configuration options for vmware</caption>
<caption>Description of VMware configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_wsgi">
<caption>Description of configuration options for wsgi</caption>
<caption>Description of WSGI configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_zmq">
<caption>Description of configuration options for zmq</caption>
<caption>Description of ZeroMQ configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_amqp">
<caption>Description of configuration options for amqp</caption>
<caption>Description of AMQP configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_api">
<caption>Description of configuration options for api</caption>
<caption>Description of API configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_assignment">
<caption>Description of configuration options for assignment</caption>
<caption>Description of assignment configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_auth">
<caption>Description of configuration options for auth</caption>
<caption>Description of authorization configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_auth_token">
<caption>Description of configuration options for auth_token</caption>
<caption>Description of authorization token configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_cache">
<caption>Description of configuration options for cache</caption>
<caption>Description of cache configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_catalog">
<caption>Description of configuration options for catalog</caption>
<caption>Description of catalog configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_credential">
<caption>Description of configuration options for credential</caption>
<caption>Description of credential configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_database">
<caption>Description of configuration options for database</caption>
<caption>Description of database configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_debug">
<caption>Description of configuration options for debug</caption>
<caption>Description of debug configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_ec2">
<caption>Description of configuration options for ec2</caption>
<caption>Description of EC2 configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_federation">
<caption>Description of configuration options for federation</caption>
<caption>Description of federation configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_identity">
<caption>Description of configuration options for identity</caption>
<caption>Description of identity configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_kvs">
<caption>Description of configuration options for kvs</caption>
<caption>Description of KVS configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_ldap">
<caption>Description of configuration options for ldap</caption>
<caption>Description of LDAP configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@ -313,6 +313,10 @@
<td>user_enabled_emulation_dn = None</td>
<td>(StrOpt) DN of the group entry to hold enabled users when using enabled emulation.</td>
</tr>
<tr>
<td>user_enabled_invert = False</td>
<td>(BoolOpt) Invert the meaning of the boolean enabled values. Some LDAP servers use a boolean lock attribute where "true" means an account is disabled. Setting "user_enabled_invert = true" will allow these lock attributes to be used. This setting will have no effect if "user_enabled_mask" or "user_enabled_emulation" settings are in use.</td>
</tr>
<tr>
<td>user_enabled_mask = 0</td>
<td>(IntOpt) Bitmask integer to indicate the bit that the enabled value is stored in if the LDAP server represents "enabled" as a bit on an integer rather than a boolean. A value of "0" indicates the mask is not used. If this is not set to "0" the typical value is "2". This is typically used when "user_enabled_attribute = userAccountControl".</td>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_logging">
<caption>Description of configuration options for logging</caption>
<caption>Description of logging configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@ -18,7 +18,7 @@
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN</td>
<td>default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_mapping">
<caption>Description of configuration options for mapping</caption>
<caption>Description of mapping configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_memcache">
<caption>Description of configuration options for memcache</caption>
<caption>Description of memcache configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_oauth">
<caption>Description of configuration options for oauth</caption>
<caption>Description of OAuth configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_os_inherit">
<caption>Description of configuration options for os_inherit</caption>
<caption>Description of os_inherit configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_policy">
<caption>Description of configuration options for policy</caption>
<caption>Description of policy configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_qpid">
<caption>Description of configuration options for qpid</caption>
<caption>Description of Qpid configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_rabbit">
<caption>Description of configuration options for rabbit</caption>
<caption>Description of RabbitMQ configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_redis">
<caption>Description of configuration options for redis</caption>
<caption>Description of Redis configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_revoke">
<caption>Description of configuration options for revoke</caption>
<caption>Description of revoke configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_security">
<caption>Description of configuration options for security</caption>
<caption>Description of security configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_ssl">
<caption>Description of configuration options for ssl</caption>
<caption>Description of SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_stats">
<caption>Description of configuration options for stats</caption>
<caption>Description of stats configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_token">
<caption>Description of configuration options for token</caption>
<caption>Description of token configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_trust">
<caption>Description of configuration options for trust</caption>
<caption>Description of trust configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_keystone_zeromq">
<caption>Description of configuration options for zeromq</caption>
<caption>Description of ZeroMQ configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

View File

@ -0,0 +1,14 @@
filesystem filesystem
gridfs GridFS
imagecache flagmappings
matchmaker matchmaker
paste paste
policy policy
profiler profiler
rbd RBD
registry registry
s3 S3
sheepdog Sheepdog
testing testing
wsgi WSGI
zmq ZeroMQ

View File

@ -263,6 +263,7 @@ ldap/user_enabled_attribute ldap
ldap/user_enabled_default ldap
ldap/user_enabled_emulation ldap
ldap/user_enabled_emulation_dn ldap
ldap/user_enabled_invert ldap
ldap/user_enabled_mask ldap
ldap/user_filter ldap
ldap/user_id_attribute ldap

View File

@ -0,0 +1,20 @@
assignment assignment
cache cache
catalog catalog
credential credential
ec2 EC2
federation federation
identity identity
kvs KVS
ldap LDAP
mapping mapping
memcache memcache
oauth OAuth
os_inherit os_inherit
policy policy
rabbit RabbitMQ
revoke revoke
security security
stats stats
token token
trust trust

View File

@ -2,6 +2,7 @@ amqp AMQP
api API
auth authorization
auth_token authorization token
cinder cinder
common common
database database
debug debug