Merge "sql.Driver:authenticate() signatures should match"

5 files changed, 5 insertions, 5 deletions

diff --git a/keystone/identity/backends/kvs.py b/keystone/identity/backends/kvs.py
index 83535108..0323d3d0 100644
--- a/keystone/identity/backends/kvs.py
+++ b/keystone/identity/backends/kvs.py
@@ -28,7 +28,7 @@ class Identity(kvs.Base, identity.Driver):
         return "keystone.assignment.backends.kvs.Assignment"
 
     # Public interface
-    def authenticate(self, user_id=None, password=None):
+    def authenticate(self, user_id, password):
         user_ref = None
         try:
             user_ref = self._get_user(user_id)
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index 7f5cedc3..f9e546a9 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -52,7 +52,7 @@ class Identity(identity.Driver):
     def create_project(self, project_id, project):
         return self.assignment_api.create_project(project_id, project)
 
-    def authenticate(self, user_id=None, password=None):
+    def authenticate(self, user_id, password):
         try:
             user_ref = self._get_user(user_id)
         except exception.UserNotFound:
diff --git a/keystone/identity/backends/pam.py b/keystone/identity/backends/pam.py
index 5cfa5b16..2a6ee621 100644
--- a/keystone/identity/backends/pam.py
+++ b/keystone/identity/backends/pam.py
@@ -58,7 +58,7 @@ class PamIdentity(identity.Driver):
     Tenant is always the same as User, root user has admin role.
     """
 
-    def authenticate(self, user_id=None, password=None):
+    def authenticate(self, user_id, password):
         auth = pam.authenticate if pam else PAM_authenticate
         if not auth(user_id, password):
             raise AssertionError('Invalid user / password')
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index 2c00088e..ba97758c 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -84,7 +84,7 @@ class Identity(sql.Base, identity.Driver):
         return utils.check_password(password, user_ref.password)
 
     # Identity interface
-    def authenticate(self, user_id=None, password=None):
+    def authenticate(self, user_id, password):
         session = self.get_session()
         user_ref = None
         try:
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index b3efc0a7..3d9bcf62 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -216,7 +216,7 @@ class Manager(manager.Manager):
 
 class Driver(object):
     """Interface description for an Identity driver."""
-    def authenticate_user(self, user_id, password):
+    def authenticate(self, user_id, password):
         """Authenticate a given user and password.
         :returns: user_ref
         :raises: AssertionError