openstack/barbican
Code Issues Proposed changes

Merge "Fix usage of keystone v3"

Browse Source
This commit is contained in:
Jenkins 2015-01-14 23:50:55 +00:00 committed by Gerrit Code Review
commit 86bbcc41cf
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/barbican/barbican-api-paste.ini
View File

@ -31,21 +31,21 @@ paste.app_factory = barbican.api.app:create_version_app
[filter:simple] [filter:simple]
paste.filter_factory = barbican.api.middleware.simple:SimpleFilter.factory paste.filter_factory = barbican.api.middleware.simple:SimpleFilter.factory
[filter:unauthenticated-context] [filter:unauthenticated-context]
paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMiddleware.factory paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMiddleware.factory
[filter:context] [filter:context]
paste.filter_factory = barbican.api.middleware.context:ContextMiddleware.factory paste.filter_factory = barbican.api.middleware.context:ContextMiddleware.factory
[filter:keystone_authtoken] [filter:keystone_authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
signing_dir = /tmp/barbican/cache signing_dir = /tmp/barbican/cache
#need ability to re-auth a token, thus admin url #need ability to re-auth a token, thus admin url
identity_uri = http://localhost:35357 identity_uri = http://localhost:35357
admin_tenant_name = service admin_tenant_name = service
admin_user = barbican admin_user = barbican
admin_password = orange admin_password = orange
auth_version = v2.0 auth_version = v3.0
#delay failing perhaps to log the unauthorized request in barbican .. #delay failing perhaps to log the unauthorized request in barbican ..
#delay_auth_decision = true #delay_auth_decision = true

6
etc/dev_tempest.conf
View File

@ -4,16 +4,18 @@
[identity] [identity]
# Replace these with values that represent your identity configuration # Replace these with values that represent your identity configuration
uri=http://localhost:5000/v2.0 uri=http://localhost:5000/v2.0
uri_v3=<None> uri_v3=http://localhost:5000/v3
auth_version=v2 auth_version=v3
username=admin username=admin
tenant_name=admin tenant_name=admin
password=password password=password
domain_name=Default
admin_username=admin admin_username=admin
admin_tenant_name=admin admin_tenant_name=admin
admin_password=password admin_password=password
admin_domain_name=Default
[identity-feature-enabled] [identity-feature-enabled]
# Leaving this as a placeholder # Leaving this as a placeholder

3
functionaltests/api/base.py
View File

@ -72,7 +72,8 @@ class BarbicanCredentials(auth.KeystoneV3Credentials):
credentials = dict( credentials = dict(
username=CONF.identity.admin_username, username=CONF.identity.admin_username,
password=CONF.identity.admin_password, password=CONF.identity.admin_password,
project_name=CONF.identity.admin_tenant_name project_name=CONF.identity.admin_tenant_name,
domain_name=CONF.identity.admin_domain_name,
) )
super(BarbicanCredentials, self).__init__(**credentials) super(BarbicanCredentials, self).__init__(**credentials)