From 996c2dbbfbd0067058317b21cc103316f68730a9 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Fri, 17 Jul 2015 17:15:49 -0700 Subject: [PATCH] Move backends.py to keystone.server The backends module is only used by keystone server to kick off the various backends. Change-Id: I3a803a35a7d02d9033b3f94032a745f173f008fa --- keystone/cmd/cli.py | 2 +- keystone/{ => server}/backends.py | 0 keystone/server/common.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename keystone/{ => server}/backends.py (100%) diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py index a2f497a1a8..8a2b384560 100644 --- a/keystone/cmd/cli.py +++ b/keystone/cmd/cli.py @@ -22,7 +22,6 @@ from oslo_log import log from oslo_serialization import jsonutils import pbr.version -from keystone import backends from keystone.common import driver_hints from keystone.common import openssl from keystone.common import sql @@ -31,6 +30,7 @@ from keystone.common import utils from keystone import config from keystone import exception from keystone.i18n import _, _LW +from keystone.server import backends from keystone import token diff --git a/keystone/backends.py b/keystone/server/backends.py similarity index 100% rename from keystone/backends.py rename to keystone/server/backends.py diff --git a/keystone/server/common.py b/keystone/server/common.py index fda44eea02..2de6d39eef 100644 --- a/keystone/server/common.py +++ b/keystone/server/common.py @@ -14,10 +14,10 @@ from oslo_config import cfg -from keystone import backends from keystone.common import dependency from keystone.common import sql from keystone import config +from keystone.server import backends CONF = cfg.CONF