diff --git a/keystone/common/manager.py b/keystone/common/manager.py
index daec40a8d9..3fcb4e78f4 100644
--- a/keystone/common/manager.py
+++ b/keystone/common/manager.py
@@ -26,6 +26,11 @@ from keystone.i18n import _
 
 LOG = log.getLogger(__name__)
 
+if hasattr(inspect, 'getfullargspec'):
+    getargspec = inspect.getfullargspec
+else:
+    getargspec = inspect.getargspec
+
 
 def response_truncated(f):
     """Truncate the list returned by the wrapped function.
@@ -85,7 +90,7 @@ class _TraceMeta(type):
 
     @staticmethod
     def wrapper(__f, __classname):
-        __argspec = inspect.getargspec(__f)
+        __argspec = getargspec(__f)
         __fn_info = '%(module)s.%(classname)s.%(funcname)s' % {
             'module': inspect.getmodule(__f).__name__,
             'classname': __classname,