Remove swiftclient dependency

Code Issues Proposed changes

Removes the requirement for swiftclient in swift-dispersion-report
and swift-dispersion-populate. To prevent a dependency on
keystoneclient and to avoid reinventing the wheel with an internal
keystoneclient, authentication with keystone is only supported if
swiftclient is available. If not, only auth v1 is supported.
The dependency in swift/container/sync.py has also been removed.
Implements: blueprint remove-swiftclient-dependency
Change-Id: I6ec3b3c85a67b9ab6eb04b90ffc16daf1600e8a7

This commit is contained in:

Christian Schwede

2014年01月09日 10:15:50 +00:00

parent 6fec0dd735

commit 1f3ae6d8da

7 changed files with 231 additions and 15 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

14
bin/swift-dispersion-populate

View File

@@ -24,7 +24,11 @@ from time import time

from eventlet import GreenPool, patcher, sleep

from eventlet.pools import Pool

from swiftclient import Connection, get_auth

try:

from swiftclient import get_auth

except ImportError:

from swift.common.internal_client import get_auth

from swift.common.internal_client import SimpleClient

from swift.common.ring import Ring

from swift.common.utils import compute_eta, get_time_units, config_true_value

@@ -133,12 +137,8 @@ Usage: %%prog [options] [conf_file]

insecure=insecure)

account = url.rsplit('/', 1)[1]

connpool = Pool(max_size=concurrency)

connpool.create = lambda: Connection(conf['auth_url'],

conf['auth_user'], conf['auth_key'],

retries=retries,

preauthurl=url, preauthtoken=token,

os_options=os_options,

insecure=insecure)

connpool.create = lambda: SimpleClient(

url=url, token=token, retries=retries)

if container_populate:

container_ring = Ring(swift_dir, ring_name='container')

Remove swiftclient dependency

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

14
bin/swift-dispersion-populate

View File