Merge "Fix usage of keystone v3"

etc/barbican/barbican-api-paste.ini

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

etc/dev_tempest.conf

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

functionaltests/api/base.py

@@ -72,7 +72,8 @@ class BarbicanCredentials(auth.KeystoneV3Credentials):
         credentials = dict(
             username=CONF.identity.admin_username,
             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)