openstack
/
keystone
Code Issues Proposed changes

Merge "Import fernet providers only if used in keystone-manage"

This commit is contained in:
Jenkins 2015-04-03 19:18:36 +00:00 committed by Gerrit Code Review
parent 880e38c980 cdb13a8db5
commit eb1b4381a8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/cli.py
View File

@ -33,7 +33,6 @@ from keystone.i18n import _, _LW
from keystone import identity
from keystone import resource
from keystone import token
from keystone.token.providers.fernet import utils as fernet
CONF = cfg.CONF
@ -197,6 +196,8 @@ class FernetSetup(BasePermissionsSetup):
@classmethod
def main(cls):
from keystone.token.providers.fernet import utils as fernet
keystone_user_id, keystone_group_id = cls.get_user_group()
fernet.create_key_directory(keystone_user_id, keystone_group_id)
if fernet.validate_key_repository():
@ -226,6 +227,8 @@ class FernetRotate(BasePermissionsSetup):
@classmethod
def main(cls):
from keystone.token.providers.fernet import utils as fernet
keystone_user_id, keystone_group_id = cls.get_user_group()
if fernet.validate_key_repository():
fernet.rotate_keys(keystone_user_id, keystone_group_id)