Support keystone v3 domains in swift-dispersion

Code Issues Proposed changes

This provides the capability to specify a project_name,
project_domain_name and user_domain_name in /etc/swift/dispersion.conf.
If this values are set in dispersion.conf they get populated to the
swift-client. With this it is possible to have a specific dispersion
project specified, which is not the keystone default domain. Changes
were applied to swift-dispersion-populate and swift-dispersion-report.
Relevant man pages, the example dispersion.conf and the admin guide were
updated accordingly.
DocImpact
Closes-Bug: #1468374
Change-Id: I0e716f8d281b4d0f510bc568bcee4a13fc480ff7

This commit is contained in:

Falk Reimann

2015年06月24日 16:54:02 +02:00

committed by Ian Cordasco

parent 5370526b57

commit 363a256e58

7 changed files with 46 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

9
bin/swift-dispersion-populate

View File

@@ -119,6 +119,9 @@ Usage: %%prog [options] [conf_file]

retries = int(conf.get('retries', 5))

concurrency = int(conf.get('concurrency', 25))

endpoint_type = str(conf.get('endpoint_type', 'publicURL'))

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'))

container_populate = config_true_value(

@@ -133,6 +136,12 @@ Usage: %%prog [options] [conf_file]

retries_done = 0

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'],

Support keystone v3 domains in swift-dispersion

9 bin/swift-dispersion-populate Unescape Escape View File

9
bin/swift-dispersion-populate

View File