openstack/glance
Code Issues Proposed changes

Merge "Bump python-swiftclient version"

Browse Source
This commit is contained in:
Jenkins 2014-06-17 18:29:04 +00:00 committed by Gerrit Code Review
commit 3d90db31e3
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/configuring.rst
View File

@ -643,6 +643,15 @@ Can only be specified in configuration files.
Optional. Default: ``0``
* ``swift_store_auth_insecure``
If True, bypass SSL certificate verification for Swift.
Can only be specified in configuration files.
`This option is specific to the Swift storage backend.`
Optional. Default: ``False``
Configuring the S3 Storage Backend
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

3
etc/glance-api.conf
View File

@ -374,6 +374,9 @@ swift_enable_snet = False
# request fails
#swift_store_retry_get_count = 0
# Bypass SSL verification for Swift
#swift_store_auth_insecure = False
# ============ S3 Store Options =============================
# Address where the S3 authentication service lives

2
requirements.txt
View File

@ -25,7 +25,7 @@ stevedore>=0.14
netaddr>=0.7.6
# For Swift storage backend.
python-swiftclient>=1.6
python-swiftclient>=2.0.2
# For VMware storage backed.
oslo.vmware>=0.2 # Apache-2.0