openstack/swift
Code Issues Proposed changes

Merge "Support keystone v3 domains in swift-dispersion"

Browse Source
This commit is contained in:
Jenkins
2015-07-31 06:59:01 +00:00
committed by Gerrit Code Review
parent 44a06acdbf 363a256e58
commit e1683fdb2e
7 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/swift-dispersion-report
View File

@@ -363,6 +363,9 @@ Usage: %%prog [options] [conf_file]
and not options.container_only
if not (object_report or container_report):
exit("Neither container or object report is set to run")
user_domain_name = str(conf.get('user_domain_name', ''))
project_domain_name = str(conf.get('project_domain_name', ''))
project_name = str(conf.get('project_name', ''))
insecure = options.insecure \
or config_true_value(conf.get('keystone_api_insecure', 'no'))
if options.debug:
@@ -371,6 +374,12 @@ Usage: %%prog [options] [conf_file]
coropool = GreenPool(size=concurrency)
os_options = {'endpoint_type': endpoint_type}
if user_domain_name:
os_options['user_domain_name'] = user_domain_name
if project_domain_name:
os_options['project_domain_name'] = project_domain_name
if project_name:
os_options['project_name'] = project_name
url, token = get_auth(conf['auth_url'], conf['auth_user'],
conf['auth_key'],