openstack/glance
Code Issues Proposed changes

Merge "Add comments for swift options in glance-api.conf."

Browse Source
This commit is contained in:
Jenkins 2012-01-10 02:41:04 +00:00 committed by Gerrit Code Review
commit e27b0e1c27
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -9,6 +9,7 @@ Dan Prince <dan.prince@rackspace.com>
Donal Lafferty <donal.lafferty@citrix.com> Donal Lafferty <donal.lafferty@citrix.com>
Eldar Nugaev <enugaev@griddynamics.com> Eldar Nugaev <enugaev@griddynamics.com>
Ewan Mellor <ewan.mellor@citrix.com> Ewan Mellor <ewan.mellor@citrix.com>
Hengqing Hu <hudayou@hotmail.com>
Isaku Yamahata <yamahata@valinux.co.jp> Isaku Yamahata <yamahata@valinux.co.jp>
Jason Koelker <jason@koelker.net> Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com> Jay Pipes <jaypipes@gmail.com>

7
etc/glance-api.conf
View File

@ -102,10 +102,15 @@ filesystem_store_datadir = /var/lib/glance/images/
# ============ Swift Store Options ============================= # ============ Swift Store Options =============================
# Address where the Swift authentication service lives # Address where the Swift authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'https://'
swift_store_auth_address = 127.0.0.1:8080/v1.0/ swift_store_auth_address = 127.0.0.1:8080/v1.0/
# User to authenticate against the Swift authentication service # User to authenticate against the Swift authentication service
swift_store_user = jdoe # If you use Swift authentication service, set it to 'account':'user'
# where 'account' is a Swift storage account and 'user'
# is a user in that account
swift_store_user = jdoe:jdoe
# Auth key for the user authenticating against the # Auth key for the user authenticating against the
# Swift authentication service # Swift authentication service

14
glance/store/swift.py
View File

@ -102,12 +102,14 @@ class StoreLocation(glance.store.location.StoreLocation):
# swift://user:pass@http://authurl.com/v1/container/obj # swift://user:pass@http://authurl.com/v1/container/obj
# are immediately rejected. # are immediately rejected.
if uri.count('://') != 1: if uri.count('://') != 1:
reason = _("URI Cannot contain more than one occurrence of a " reason = _(
"scheme. If you have specified a " "URI cannot contain more than one occurrence of a scheme."
"URI like swift://user:pass@http://authurl.com/v1/" "If you have specified a URI like "
"container/obj, you need to change it to use the " "swift://user:pass@http://authurl.com/v1/container/obj"
"swift+http:// scheme, like so: " ", you need to change it to use the swift+http:// scheme, "
"swift+http://user:pass@authurl.com/v1/container/obj") "like so: "
"swift+http://user:pass@authurl.com/v1/container/obj"
)
raise exception.BadStoreUri(uri, reason) raise exception.BadStoreUri(uri, reason)
pieces = urlparse.urlparse(uri) pieces = urlparse.urlparse(uri)