openstack/openstack-manuals
Code Issues Proposed changes

Adds swift_store_cacert option to config reference

Browse Source 
A swift_store_cacert option is added to the Description of
 swift configuration options table (glance_store section) in the
 Configuration Reference Guide. It allows Glance's services
 to perform SSL verification when communicating with Swift
 (using a string that gives the path to a CA certificate bundle file).
 All the Glance tables were automatically regenerated, and the
 ones with changes were added to the patch.

Change-Id: Ieea6c557e9d2a30db700c60c7628cc358b0f9e5a
Closes-Bug: #1421220
This commit is contained in:
Olena Logvinova 2015-02-26 18:46:40 +02:00
parent 87a532060c
commit 8a21cc8b0a
10 changed files with 15 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/common/tables/glance-amqp.xml
View File

@ -17,14 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Auto-delete queues in AMQP.</td>
</tr>
<tr>
<td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Use durable queues in AMQP.</td>
</tr>
<tr>
<td><option>control_exchange</option> = <replaceable>openstack</replaceable></td>
<td>(StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.</td>

2
doc/common/tables/glance-api.xml
View File

@ -104,7 +104,7 @@
</tr>
<tr>
<td><option>store_type_preference</option> = <replaceable></replaceable></td>
<td>(ListOpt) The store names to use to get store preference order. The name must be registered by one of the stores defined by the 'known_stores' config option. This option will be applied when you using 'store_type' option as image location strategy defined by the 'location_strategy' config option.</td>
<td>(ListOpt) The store names to use to get store preference order. The name must be registered by one of the stores defined by the 'stores' config option. This option will be applied when you using 'store_type' option as image location strategy defined by the 'location_strategy' config option.</td>
</tr>
</tbody>
</table>

8
doc/common/tables/glance-database.xml
View File

@ -42,19 +42,19 @@
</tr>
<tr>
<td><option>db_inc_retry_interval</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) If True, increases the interval between database connection retries up to db_max_retry_interval.</td>
<td>(BoolOpt) If True, increases the interval between retries of a database operation up to db_max_retry_interval.</td>
</tr>
<tr>
<td><option>db_max_retries</option> = <replaceable>20</replaceable></td>
<td>(IntOpt) Maximum database connection retries before error is raised. Set to -1 to specify an infinite retry count.</td>
<td>(IntOpt) Maximum retries in case of connection error or deadlock error before error is raised. Set to -1 to specify an infinite retry count.</td>
</tr>
<tr>
<td><option>db_max_retry_interval</option> = <replaceable>10</replaceable></td>
<td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between database connection retries.</td>
<td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between retries of a database operation.</td>
</tr>
<tr>
<td><option>db_retry_interval</option> = <replaceable>1</replaceable></td>
<td>(IntOpt) Seconds between database connection retries.</td>
<td>(IntOpt) Seconds between retries of a database transaction.</td>
</tr>
<tr>
<td><option>idle_timeout</option> = <replaceable>3600</replaceable></td>

2
doc/common/tables/glance-filesystem.xml
View File

@ -31,7 +31,7 @@
</tr>
<tr>
<td><option>filesystem_store_metadata_file</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) The path to a file which contains the metadata to be returned with any location associated with this store. The file must contain a valid JSON dict.</td>
<td>(StrOpt) The path to a file which contains the metadata to be returned with any location associated with this store. The file must contain a valid JSON object. The object should contain the keys 'id' and 'mountpoint'. The value for both keys should be 'string'.</td>
</tr>
</tbody>
</table>

2
doc/common/tables/glance-imagecache.xml
View File

@ -39,7 +39,7 @@
</tr>
<tr>
<td><option>image_cache_max_size</option> = <replaceable>10737418240</replaceable></td>
<td>(IntOpt) The maximum size in bytes that the cache can use.</td>
<td>(IntOpt) The upper limit (the maximum size of accumulated cache in bytes) beyond which pruner, if running, starts cleaning the images cache.</td>
</tr>
<tr>
<td><option>image_cache_sqlite_db</option> = <replaceable>cache.db</replaceable></td>

6
doc/common/tables/glance-rpc.xml
View File

@ -37,17 +37,13 @@
<td><option>rpc_cast_timeout</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.</td>
</tr>
<tr>
<td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Size of RPC connection pool.</td>
</tr>
<tr>
<td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Seconds to wait for a response from a call.</td>
</tr>
<tr>
<td><option>rpc_thread_pool_size</option> = <replaceable>64</replaceable></td>
<td>(IntOpt) Size of RPC greenthread pool.</td>
<td>(IntOpt) Size of RPC thread pool.</td>
</tr>
<tr>
<th colspan="2">[oslo_messaging_amqp]</th>

10
doc/common/tables/glance-swift.xml
View File

@ -44,10 +44,6 @@
<td><option>default_swift_reference</option> = <replaceable>ref1</replaceable></td>
<td>(StrOpt) The reference to the default swift account/backing store parameters to use for adding new images.</td>
</tr>
<tr>
<td><option>swift_enable_snet</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Whether to use ServiceNET to communicate with the Swift storage servers.</td>
</tr>
<tr>
<td><option>swift_store_admin_tenants</option> = <replaceable></replaceable></td>
<td>(ListOpt) A list of tenants that will be granted read/write access on all Swift containers created by Glance in multi-tenant mode.</td>
@ -64,13 +60,17 @@
<td><option>swift_store_auth_version</option> = <replaceable>2</replaceable></td>
<td>(StrOpt) Version of the authentication service to use. Valid versions are 2 for keystone and 1 for swauth and rackspace. (deprecated)</td>
</tr>
<tr>
<td><option>swift_store_cacert</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) A string giving the CA certificate file to use in SSL connections for verifying certs.</td>
</tr>
<tr>
<td><option>swift_store_config_file</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) The config file that has the swift account(s)configs.</td>
</tr>
<tr>
<td><option>swift_store_container</option> = <replaceable>glance</replaceable></td>
<td>(StrOpt) Container within the account that the account should use for storing images in Swift.</td>
<td>(StrOpt) Container within the account that the account should use for storing images in Swift when using single container mode. In multiple container mode, this will be the prefix for all containers.</td>
</tr>
<tr>
<td><option>swift_store_create_container_on_put</option> = <replaceable>False</replaceable></td>

4
doc/common/tables/glance-testing.xml
View File

@ -17,10 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>fake_rabbit</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake</td>
</tr>
<tr>
<td><option>pydev_worker_debug_host</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) The hostname/IP of the pydev process listening for debug connections</td>

2
doc/common/tables/glance-zeromq.xml
View File

@ -34,7 +34,7 @@
<td>(StrOpt) Directory for holding IPC sockets.</td>
</tr>
<tr>
<td><option>rpc_zmq_matchmaker</option> = <replaceable>oslo.messaging._drivers.matchmaker.MatchMakerLocalhost</replaceable></td>
<td><option>rpc_zmq_matchmaker</option> = <replaceable>oslo_messaging._drivers.matchmaker.MatchMakerLocalhost</replaceable></td>
<td>(StrOpt) MatchMaker driver.</td>
</tr>
<tr>

34
tools/autogenerate-config-flagmappings/glance.flagmappings Normal file → Executable file
View File

@ -5,8 +5,6 @@ admin_user registry
allow_additional_image_properties common
allow_anonymous_access api
allowed_rpc_exception_modules rpc
amqp_auto_delete amqp
amqp_durable_queues amqp
api_limit_max common
auth_region registry
auth_strategy registry
@ -30,7 +28,6 @@ enable_v1_api api
enable_v1_registry api
enable_v2_api api
enable_v2_registry api
fake_rabbit testing
fatal_deprecations logging
image_cache_dir imagecache
image_cache_driver imagecache
@ -45,11 +42,6 @@ image_tag_quota common
instance_format logging
instance_uuid_format logging
key_file ca
kombu_reconnect_delay rabbitmq
kombu_ssl_ca_certs rabbitmq
kombu_ssl_certfile rabbitmq
kombu_ssl_keyfile rabbitmq
kombu_ssl_version rabbitmq
limit_param_default common
location_strategy api
log_config_append logging
@ -79,29 +71,6 @@ public_endpoint api
publish_errors logging
pydev_worker_debug_host testing
pydev_worker_debug_port testing
qpid_heartbeat qpid
qpid_hostname qpid
qpid_hosts qpid
qpid_password qpid
qpid_port qpid
qpid_protocol qpid
qpid_receiver_capacity qpid
qpid_sasl_mechanisms qpid
qpid_tcp_nodelay qpid
qpid_topology_version qpid
qpid_username qpid
rabbit_ha_queues rabbitmq
rabbit_host rabbitmq
rabbit_hosts rabbitmq
rabbit_login_method rabbitmq
rabbit_max_retries rabbitmq
rabbit_password rabbitmq
rabbit_port rabbitmq
rabbit_retry_backoff rabbitmq
rabbit_retry_interval rabbitmq
rabbit_use_ssl rabbitmq
rabbit_userid rabbitmq
rabbit_virtual_host rabbitmq
registry_client_ca_file registry
registry_client_cert_file registry
registry_client_insecure registry
@ -112,7 +81,6 @@ registry_host registry
registry_port registry
rpc_backend rpc
rpc_cast_timeout rpc
rpc_conn_pool_size rpc
rpc_response_timeout rpc
rpc_thread_pool_size rpc
rpc_zmq_bind_address zeromq
@ -193,11 +161,11 @@ glance_store/sheepdog_store_address sheepdog
glance_store/sheepdog_store_chunk_size sheepdog
glance_store/sheepdog_store_port sheepdog
glance_store/stores api
glance_store/swift_enable_snet swift
glance_store/swift_store_admin_tenants swift
glance_store/swift_store_auth_address swift
glance_store/swift_store_auth_insecure swift
glance_store/swift_store_auth_version swift
glance_store/swift_store_cacert swift
glance_store/swift_store_config_file swift
glance_store/swift_store_container swift
glance_store/swift_store_create_container_on_put swift