2
0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-18 19:44:35 +00:00

Fix credserver

The grubhash should only fill in if there is a value to fill in.
This commit is contained in:
Jarrod Johnson 2020-06-02 16:47:50 -04:00
parent 82ab56ebb4
commit f86429c83c

View File

@ -1708,9 +1708,9 @@ class ConfigManager(object):
if 'hashvalue' not in curr[attrib]:
curr[attrib]['hashvalue'] = hashcrypt_value(
curr[attrib]['value'])
if 'grubhashvalue' not in curr[attrib]:
curr[attrib]['grubhashvalue'] = grub_hashcrypt_value(
curr[attrib]['value'])
if 'grubhashvalue' not in curr[attrib]:
curr[attrib]['grubhashvalue'] = grub_hashcrypt_value(
curr[attrib]['value'])
if 'value' in curr[attrib]:
del curr[attrib]['value']
if cfgleader: # currently config slave to another
@ -2130,9 +2130,9 @@ class ConfigManager(object):
if 'hashvalue' not in curr[attrib]:
curr[attrib]['hashvalue'] = hashcrypt_value(
curr[attrib]['value'])
if 'grubhashvalue' not in curr[attrib]:
curr[attrib]['grubhashvalue'] = grub_hashcrypt_value(
curr[attrib]['value'])
if 'grubhashvalue' not in curr[attrib]:
curr[attrib]['grubhashvalue'] = grub_hashcrypt_value(
curr[attrib]['value'])
if 'value' in curr[attrib]:
del curr[attrib]['value']
if cfgleader: # currently config slave to another