Merge "Wire in ConfKeyManager._generate_hex_key!"

openstack/nova

Code Issues Proposed changes

This commit is contained in:

Jenkins

2013年09月16日 22:19:32 +00:00

committed by Gerrit Code Review

parent a77763244f 2f43ba83b6

commit 1d1115e890

1 changed files with 2 additions and 3 deletions

@@ -55,11 +55,10 @@ class ConfKeyManager(single_key_mgr.SingleKeyManager):

"""

def __init__(self):

super(ConfKeyManager, self).__init__()

if CONF.keymgr.fixed_key is None:

raise ValueError(_('keymgr.fixed_key not defined'))

self._hex_key = CONF.keymgr.fixed_key

super(ConfKeyManager, self).__init__()

def _get_hex_key(self):

def _generate_hex_key(self, **kwargs):

return self._hex_key