vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-31 04:30:44 +00:00
Code Issues Projects Releases Wiki Activity

swift: Add support for Swift API v1 (without Keystone)

Browse Source 
This commit also add a workaround for bug/feature[1]
the password is changed every time :-)

[1]https://github.com/ccollicutt/docker-swift-onlyone/commit/c9f5e41b745eee18e7ddc807481bc9729d8cdac0
This commit is contained in:
Sebastien Badia
2015-02-10 11:46:11 +01:00
parent 355a98b51f
commit 20adfd49a7
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.swift.sh
+5 -5
View File
@@ -1,6 +1,6 @@
export OS_AUTH_URL=http://127.0.0.1:8181/v2.0/ export ST_AUTH=http://127.0.0.1:8181/auth/v1.0
export OS_USERNAME=user_test export ST_USER=test:tester
export OS_PASSWORD=tester ID=`docker run -d -p 8080:8080 serverascode/swift-onlyone`
export OS_TENANT_NAME=testing sleep 10 # Give the script that change the passwords some time
export ST_KEY=`docker logs $ID | grep "user_test_tester =" | cut -d " " -f 3`
pip install python-keystoneclient python-swiftclient pip install python-keystoneclient python-swiftclient
docker run -d -p 8080:8080 serverascode/swift-onlyone
system/swift_lib.py
+7
View File
@@ -15,6 +15,13 @@ try:
account_username = "%s:%s" % (auth_tenant, auth_username) account_username = "%s:%s" % (auth_tenant, auth_username)
swift_conn = swiftclient.Connection(auth_url, account_username, swift_conn = swiftclient.Connection(auth_url, account_username,
auth_password, auth_version=2) auth_password, auth_version=2)
elif 'ST_USER' in os.environ and 'ST_KEY' in os.environ:
auth_username = os.environ.get('ST_USER')
auth_password = os.environ.get('ST_KEY')
auth_url = os.environ.get('ST_AUTH')
# Using auth version 1 (/auth/v1.0)
swift_conn = swiftclient.Connection(auth_url, auth_username,
auth_password, auth_version=1)
else: else:
swift_conn = None swift_conn = None
except ImportError: except ImportError: