xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-08-24 20:20:36 +00:00
Code Issues Projects Releases Wiki Activity

Correct issues with the attempted merge of crypto and configmanager

Browse Source
This commit is contained in:
Jarrod Johnson
2013-11-02 17:35:58 -04:00
parent 4eaaa0c1a9
commit 265dc4215e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
confluent/config/configmanager.py
View File

@@ -102,7 +102,7 @@ def _format_key(key, passphrase=None):
def init_masterkey(passphrase=None):
global _masterkey
global _masterintegritykey
cfgn = configmanager.get_global('master_privacy_key')
cfgn = get_global('master_privacy_key')
if cfgn:
_masterkey = _get_protected_key(cfgn, passphrase=passphrase)
@@ -111,7 +111,7 @@ def init_masterkey(passphrase=None):
configmanager.set_global('master_privacy_key', _format_key(
_masterkey,
passphrase=passphrase))
cfgn = configmanager.get_global('master_integrity_key')
cfgn = get_global('master_integrity_key')
if cfgn:
_masterintegritykey = _get_protected_key(cfgn, passphrase=passphrase)
else: