Move fernet utils into keystone/common/

If we are going to be using fernet utilities to implement encryption of
credentials at rest, we should put the utilities in a more available
place.

bp credential-encryption

Change-Id: I06aff77836527885b3df1cbd25834906cda73910
This commit is contained in:
Werner Mendizabal 2016-08-10 19:46:18 +00:00 committed by Steve Martinelli
parent 42a1f1cfe8
commit 4dafc37d5f
6 changed files with 6 additions and 6 deletions

View File

@ -524,7 +524,7 @@ class FernetSetup(BasePermissionsSetup):
@classmethod
def main(cls):
from keystone.token.providers.fernet import utils as fernet
from keystone.common import fernet_utils as fernet
keystone_user_id, keystone_group_id = cls.get_user_group()
fernet.create_key_directory(keystone_user_id, keystone_group_id)
@ -555,7 +555,7 @@ class FernetRotate(BasePermissionsSetup):
@classmethod
def main(cls):
from keystone.token.providers.fernet import utils as fernet
from keystone.common import fernet_utils as fernet
keystone_user_id, keystone_group_id = cls.get_user_group()
if fernet.validate_key_repository(requires_write=True):

View File

@ -12,7 +12,7 @@
import keystone.conf
from keystone.token.providers.fernet import utils as fernet_utils
from keystone.common import fernet_utils
CONF = keystone.conf.CONF

View File

@ -12,7 +12,7 @@
import fixtures
from keystone.token.providers.fernet import utils
from keystone.common import fernet_utils as utils
class KeyRepository(fixtures.Fixture):

View File

@ -20,6 +20,7 @@ import msgpack
from oslo_utils import timeutils
from six.moves import urllib
from keystone.common import fernet_utils
from keystone.common import utils
import keystone.conf
from keystone import exception
@ -30,7 +31,6 @@ from keystone.tests.unit.ksfixtures import database
from keystone.token import provider
from keystone.token.providers import fernet
from keystone.token.providers.fernet import token_formatters
from keystone.token.providers.fernet import utils as fernet_utils
CONF = keystone.conf.CONF

View File

@ -24,12 +24,12 @@ from six.moves import map
from six.moves import urllib
from keystone.auth import plugins as auth_plugins
from keystone.common import fernet_utils as utils
from keystone.common import utils as ks_utils
import keystone.conf
from keystone import exception
from keystone.i18n import _, _LI
from keystone.token import provider
from keystone.token.providers.fernet import utils
CONF = keystone.conf.CONF