summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2015-03-08 11:21:46 -0500
committerBrant Knudson <bknudson@us.ibm.com>2015-04-03 16:32:35 +0000
commitcdb13a8db59024d21080db7de9c2106c28f55427 (patch)
treefd07c4ceac81a97744b5c01a2a49bc1375f7dab6
parentc3f77c9a57ce2b6f023205d54ef9df4d5290db42 (diff)
downloadkeystone-cdb13a8db59024d21080db7de9c2106c28f55427.tar.gz
Import fernet providers only if used in keystone-manage
The fernet provider is optional and has extra requirements beyond other token providers. keystone-manage shouldn't require these extra requirements just to run. Closes-Bug: 1440123 Change-Id: I2363e090372bdb709a6754a216db45fc649a5aed
-rw-r--r--keystone/cli.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/keystone/cli.py b/keystone/cli.py
index 6158973f2..8df48348b 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -29,7 +29,6 @@ from keystone import config
from keystone.i18n import _, _LW
from keystone import identity
from keystone import token
-from keystone.token.providers.fernet import utils as fernet
CONF = cfg.CONF
@@ -192,6 +191,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():
@@ -221,6 +222,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)