diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-swift')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-swift/dispersion.conf | 2 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf index 25119ff..2557abb 100644 --- a/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf +++ b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | [dispersion] | 1 | [dispersion] |
| 2 | auth_url = http://localhost:5000/v2.0/ | 2 | auth_url = http://localhost:8081/keystone/main |
| 3 | auth_user = %SERVICE_TENANT_NAME%:%SERVICE_USER% | 3 | auth_user = %SERVICE_TENANT_NAME%:%SERVICE_USER% |
| 4 | auth_key = %SERVICE_PASSWORD% | 4 | auth_key = %SERVICE_PASSWORD% |
| 5 | auth_version = 2.0 | 5 | auth_version = 2.0 |
diff --git a/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf b/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf index d005d8e..eef6ac5 100644 --- a/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf +++ b/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf | |||
| @@ -247,10 +247,7 @@ user_test_tester3 = testing3 | |||
| 247 | # | 247 | # |
| 248 | [filter:authtoken] | 248 | [filter:authtoken] |
| 249 | paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory | 249 | paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory |
| 250 | auth_host = 127.0.0.1 | 250 | identity_uri=http://127.0.0.1:8081/keystone/main |
| 251 | auth_port = 35357 | ||
| 252 | auth_protocol = http | ||
| 253 | # auth_uri = http://127.0.0.1:5000/ | ||
| 254 | admin_tenant_name = %SERVICE_TENANT_NAME% | 251 | admin_tenant_name = %SERVICE_TENANT_NAME% |
| 255 | admin_user = %SERVICE_USER% | 252 | admin_user = %SERVICE_USER% |
| 256 | admin_password = %SERVICE_PASSWORD% | 253 | admin_password = %SERVICE_PASSWORD% |
