Merge "Refactor: Workaround for python build_sphinx failure"

4 files changed, 2 insertions, 2 deletions

diff --git a/keystone/logic/service.py b/keystone/logic/service.py
index 2d1b6f08..c76c971e 100755
--- a/keystone/logic/service.py
+++ b/keystone/logic/service.py
@@ -35,8 +35,8 @@ from keystone.logic.types.credential import Credentials, PasswordCredentials
 from keystone import utils
 # New imports as we refactor old backend design and models
 from keystone.models import Tenant, Token
-from keystone.token import Manager as TokenManager
-from keystone.tenant import Manager as TenantManager
+from keystone.managers.token import Manager as TokenManager
+from keystone.managers.tenant import Manager as TenantManager
 
 
 LOG = logging.getLogger('keystone.logic.service')
diff --git a/keystone/managers/__init__.py b/keystone/managers/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone/managers/__init__.py
diff --git a/keystone/tenant.py b/keystone/managers/tenant.py
index e846d7b0..e846d7b0 100644
--- a/keystone/tenant.py
+++ b/keystone/managers/tenant.py
diff --git a/keystone/token.py b/keystone/managers/token.py
index 99607a58..99607a58 100644
--- a/keystone/token.py
+++ b/keystone/managers/token.py