openstack/zaqar
Code Issues Proposed changes

Merge "Add domain configuration in Swift backend"

Browse Source
This commit is contained in:
Jenkins 2017-04-11 23:46:15 +00:00 committed by Gerrit Code Review
commit a08ed0d7a3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zaqar/storage/swift/driver.py
View File

@ -98,8 +98,10 @@ class _ClientWrapper(object):
username=self.parsed_url.username, username=self.parsed_url.username,
password=self.parsed_url.password, password=self.parsed_url.password,
project_name=self.parsed_url.path[1:], project_name=self.parsed_url.path[1:],
user_domain_id='default', user_domain_id=self.conf.user_domain_id,
project_domain_id='default', user_domain_name=self.conf.user_domain_name,
project_domain_id=self.conf.project_domain_id,
project_domain_name=self.conf.project_domain_name,
auth_url=self.conf.auth_url) auth_url=self.conf.auth_url)
self.session = keystone_session.Session(auth=self.auth) self.session = keystone_session.Session(auth=self.auth)
self.url = self.session.get_endpoint(service_type='object-store') self.url = self.session.get_endpoint(service_type='object-store')
@ -113,5 +115,6 @@ class _ClientWrapper(object):
self._refresh_auth() self._refresh_auth()
client = swiftclient.Connection( client = swiftclient.Connection(
preauthurl=self.url, preauthurl=self.url,
preauthtoken=self.token) preauthtoken=self.token,
insecure=self.conf.insecure)
return getattr(client, attr) return getattr(client, attr)

11
zaqar/storage/swift/options.py
View File

@ -15,12 +15,17 @@
from oslo_config import cfg from oslo_config import cfg
MESSAGE_SWIFT_OPTIONS = ( MESSAGE_SWIFT_OPTIONS = (
cfg.StrOpt('auth_url', default="http://127.0.0.1:5000/v3/", cfg.StrOpt("auth_url", default="http://127.0.0.1:5000/v3/",
help="URI of Keystone endpoint to discover Swift"), help="URI of Keystone endpoint to discover Swift"),
cfg.StrOpt('uri', cfg.StrOpt("uri",
default="swift://demo:nomoresecrete@/demo", default="swift://demo:nomoresecrete@/demo",
help="Custom URI describing the swift connection."), help="Custom URI describing the swift connection."),
cfg.StrOpt('insecure', default=False, help="Don't check SSL certificate"), cfg.StrOpt("insecure", default=False, help="Don't check SSL certificate"),
cfg.StrOpt("project_domain_id", default="default",
help="Domain ID containing project"),
cfg.StrOpt("project_domain_name", help="Domain name containing project"),
cfg.StrOpt("user_domain_id", default="default", help="User's domain id"),
cfg.StrOpt("user_domain_name", help="User's domain name"),
) )