openstack/karbor
Code Issues Proposed changes

Support swift auth domain name

Browse Source 
Swift is using password auth plugin. It is sometimes needed to use
domain name for project or user.

Change-Id: Ia1dce279bf6e809f1e222c003f18757f55a0575e
This commit is contained in:
Yuval Brik 2017-08-10 15:50:10 +03:00
parent d87baa3063
commit d5e2023c69
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
karbor/services/protection/clients/swift.py
View File

@ -31,7 +31,15 @@ swift_client_opts = [
help='The URL of the Keystone endpoint'), help='The URL of the Keystone endpoint'),
cfg.StrOpt('swift_tenant_name', cfg.StrOpt('swift_tenant_name',
help='Swift tenant/account name. ' help='Swift tenant/account name. '
'Required when connecting to an auth 2.0 system'), 'Required when connecting to an auth system'),
cfg.StrOpt('swift_project_domain_name',
default='default',
help='Swift project domain name.'
'Required when connecting to an auth system'),
cfg.StrOpt('swift_user_domain_name',
default='default',
help='Swift user domain name.'
'Required when connecting to an auth system'),
cfg.StrOpt('swift_user', cfg.StrOpt('swift_user',
help='Swift user name, if swift_auth_url is set.'), help='Swift user name, if swift_auth_url is set.'),
cfg.StrOpt('swift_key', cfg.StrOpt('swift_key',
@ -72,6 +80,8 @@ def create(context, conf, **kwargs):
username=client_config.swift_user, username=client_config.swift_user,
password=client_config.swift_key, password=client_config.swift_key,
project_name=client_config.swift_tenant_name, project_name=client_config.swift_tenant_name,
project_domain_name=client_config.swift_project_domain_name,
user_domain_name=client_config.swift_user_domain_name,
) )
session = keystone_session.Session(auth=auth) session = keystone_session.Session(auth=auth)