openstack/glance
Code Issues Proposed changes

Merge "Add swift_store_cacert to config files and docs"

Browse Source
This commit is contained in:
Jenkins 2015-02-12 13:54:39 +00:00 committed by Gerrit Code Review
commit cd60a24a7d
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/configuring.rst
View File

@ -692,6 +692,15 @@ Can only be specified in configuration files.
`This option is specific to the Swift storage backend.` `This option is specific to the Swift storage backend.`
* ``swift_store_cacert``
Can only be specified in configuration files.
Optional. Default: ``None``
A string giving the path to a CA certificate bundle that will allow Glance's
services to perform SSL verification when communicating with Swift.
Optional. Default: True. Optional. Default: True.
If set to False, disables SSL layer compression of https swift If set to False, disables SSL layer compression of https swift

4
etc/glance-api.conf
View File

@ -615,6 +615,10 @@ swift_store_endpoint = None
# Bypass SSL verification for Swift # Bypass SSL verification for Swift
#swift_store_auth_insecure = False #swift_store_auth_insecure = False
# The path to a CA certificate bundle file to use for SSL verification when
# communicating with Swift.
#swift_store_cacert =
# ============ S3 Store Options ============================= # ============ S3 Store Options =============================
# Address where the S3 authentication service lives # Address where the S3 authentication service lives

4
etc/glance-cache.conf
View File

@ -144,6 +144,10 @@ swift_store_endpoint = None
# Bypass SSL verification for Swift # Bypass SSL verification for Swift
#swift_store_auth_insecure = False #swift_store_auth_insecure = False
# The path to a CA certificate bundle file to use for SSL verification when
# communicating with Swift.
#swift_store_cacert =
# ============ S3 Store Options ============================= # ============ S3 Store Options =============================
# Address where the S3 authentication service lives # Address where the S3 authentication service lives