summaryrefslogtreecommitdiff
path: root/tests/sample.conf
diff options
context:
space:
mode:
authoranc <alistair.coles@hp.com>2014-03-25 08:21:21 +0000
committerAlistair Coles <alistair.coles@hp.com>2014-07-23 16:55:38 +0100
commitcae12940b1bff230381289b732b464d88423fec1 (patch)
tree41b1e60913e76b3856e8f338d724ca02966ab036 /tests/sample.conf
parent394cb57f630b3dfdc1d5b2e172ef0f1c16b8211f (diff)
downloadpython-swiftclient-cae12940b1bff230381289b732b464d88423fec1.tar.gz
Add keystone v3 auth support
Enables swiftclient to authenticate using the keystone v3 API, allowing user id's, user domains and tenant/project domains to be specified. Since swiftclient imports keystoneclient, the main changes in swiftclient/client.py are to selectively import the correct keystoneclient library version and pass a number of new options to it via the get_auth() function. In addition the get_keystoneclient_2_0 method has been renamed get_auth_keystone to better reflect its purpose since it now deals with both v2 and v3 use cases. In swiftclient/shell.py the new options are added to the parser. To make the default help message shorter, help for all the --os-* options (including the existing v2 options) is only displayed when explicitly requested usng a new --os-help option. A new set of unit tests is added to test_shell.py to verify the parser. A comment in tests/sample.conf explains how to configure the existing functional tests to run using keystone v3 API. Note that to use keystone v3 with swift you will need to set auth_version = v3.0 in the auth_token middleware config section of proxy-server.conf. Change-Id: Ifda0b3263eb919a8c6a1b204ba0a1215ed6f642f
Diffstat (limited to 'tests/sample.conf')
-rw-r--r--tests/sample.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/sample.conf b/tests/sample.conf
index 4578ab7..3b9b03d 100644
--- a/tests/sample.conf
+++ b/tests/sample.conf
@@ -4,7 +4,8 @@ auth_host = 127.0.0.1
auth_port = 8080
auth_ssl = no
auth_prefix = /auth/
-## sample config for Swift with Keystone
+## sample config for Swift with Keystone v2 API
+# For keystone v3 change auth_version to 3 and auth_prefix to /v3/
#auth_version = 2
#auth_host = localhost
#auth_port = 5000