openstack
/
glance
Code Issues Proposed changes

Merge "Replace snet config with endpoint config"

This commit is contained in:
Jenkins 2015-02-03 18:59:16 +00:00 committed by Gerrit Code Review
parent e5a6c3fe4b 41a9a06553
commit d42fd7136d
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/source/configuring.rst
View File

@ -1103,6 +1103,20 @@ Can only be specified in configuration files.
Allow to perform insecure SSL requests to ESX/VC server.
Configuring the Storage Endpoint
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* ``swift_store_endpoint=URL``
Optional. Default: ``None``
Can only be specified in configuration files.
Overrides the storage URL returned by auth. The URL should include the
path up to and excluding the container. The location of an object is
obtained by appending the container and object to the configured URL.
e.g. ``https://www.my-domain.com/v1/path_up_to_container``
Configuring the Image Cache
---------------------------

11
etc/glance-api.conf
View File

@ -554,13 +554,12 @@ swift_store_large_object_size = 5120
# the image file, and the default is 200MB
swift_store_large_object_chunk_size = 200
# Whether to use ServiceNET to communicate with the Swift storage servers.
# (If you aren't RACKSPACE, leave this False!)
# If set, the configured endpoint will be used. If None, the storage URL
# from the auth response will be used. The location of an object is
# obtained by appending the container and object to the configured URL.
#
# To use ServiceNET for authentication, prefix hostname of
# `swift_store_auth_address` with 'snet-'.
# Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/
swift_enable_snet = False
# swift_store_endpoint = https://www.example.com/v1/not_a_container
swift_store_endpoint = None
# If set to True enables multi-tenant storage mode which causes Glance images
# to be stored in tenant specific Swift accounts.

11
etc/glance-cache.conf
View File

@ -94,13 +94,12 @@ swift_store_large_object_size = 5120
# the image file, and the default is 200MB
swift_store_large_object_chunk_size = 200
# Whether to use ServiceNET to communicate with the Swift storage servers.
# (If you aren't RACKSPACE, leave this False!)
# If set, the configured endpoint will be used. If None, the storage URL
# from the auth response will be used. The location of an object is
# obtained by appending the container and object to the configured URL.
#
# To use ServiceNET for authentication, prefix hostname of
# `swift_store_auth_address` with 'snet-'.
# Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/
swift_enable_snet = False
# swift_store_endpoint = https://www.example.com/v1/not_a_container
swift_store_endpoint = None
# ============ S3 Store Options =============================