valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix an issue where thorium would remove keys of reattaching minions

Browse Source
This commit is contained in:
Thomas S Hatch 2017-01-25 15:30:56 -07:00
parent d906e8fadb
commit 13d28a34a6
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/thorium/key.py
View File

@ -71,6 +71,22 @@ def timeout(name, delete=0, reject=0):
reject_set.add(id_) reject_set.add(id_)
for id_ in remove: for id_ in remove:
keyapi.delete_key(id_) keyapi.delete_key(id_)
try:
__reg__['status']['val'].pop(id_)
except KeyError:
pass
try:
__context__[ktr].pop(id_)
except KeyError:
pass
for id_ in reject_set: for id_ in reject_set:
keyapi.reject(id_) keyapi.reject(id_)
try:
__reg__['status']['val'].pop(id_)
except KeyError:
pass
try:
__context__[ktr].pop(id_)
except KeyError:
pass
return ret return ret