saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #38953 from thatch45/thorium_keyfix

Browse source 
fix an issue where thorium would remove keys of reattaching minions
This commit is contained in:
Mike Place 2017-01-26 12:15:58 -07:00 • committed by GitHub
commit 04a5b05c36
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/thorium/key.py
View file

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