Merge "Change recommended test config to use auth_uri"
This commit is contained in:
		| @@ -1,16 +1,10 @@ | |||||||
| [func_test] | [func_test] | ||||||
| # sample config | # sample config | ||||||
| auth_host = 127.0.0.1 | auth_uri = http://127.0.0.1:8080/auth/v1.0/ | ||||||
| auth_port = 8080 |  | ||||||
| auth_ssl = no |  | ||||||
| auth_prefix = /auth/ |  | ||||||
| ## sample config for Swift with Keystone v2 API | ## sample config for Swift with Keystone v2 API | ||||||
| # For keystone v3 change auth_version to 3 and auth_prefix to /v3/ | # For keystone v3 change auth_version to 3 and auth_prefix to /v3/ | ||||||
| #auth_version = 2 | #auth_version = 2 | ||||||
| #auth_host = localhost | #auth_uri = http://localhost:5000/v2.0/ | ||||||
| #auth_port = 5000 |  | ||||||
| #auth_ssl = no |  | ||||||
| #auth_prefix = /v2.0/ |  | ||||||
|  |  | ||||||
| # Primary functional test account (needs admin access to the account). | # Primary functional test account (needs admin access to the account). | ||||||
| # By default the tests use a swiftclient.client.Connection instance with user | # By default the tests use a swiftclient.client.Connection instance with user | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Zuul
					Zuul