valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove sock_dir from crypt.dropfile()

Browse Source
This commit is contained in:
Thomas Jackson 2015-01-02 16:14:19 -08:00
parent e4556d74cb
commit 66f0932518
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/crypt.py
View File

@ -40,7 +40,7 @@ from salt.exceptions import (
log = logging.getLogger(__name__)
def dropfile(cachedir, user=None, sock_dir=None):
def dropfile(cachedir, user=None):
'''
Set an AES dropfile to request the master update the publish session key
'''
@ -61,9 +61,6 @@ def dropfile(cachedir, user=None, sock_dir=None):
pass
finally:
os.umask(mask) # restore original umask
if sock_dir:
# TODO: deprecation warning
pass
def gen_keys(keydir, keyname, keysize, user=None):

8
salt/key.py
View File

@ -752,7 +752,7 @@ class Key(object):
pass
self.check_minion_cache(preserve_minions=matches.get('minions', []))
if self.opts.get('rotate_aes_key'):
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'], self.opts['sock_dir'])
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'])
return (
self.name_match(match) if match is not None
else self.dict_match(matches)
@ -774,7 +774,7 @@ class Key(object):
pass
self.check_minion_cache()
if self.opts.get('rotate_aes_key'):
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'], self.opts['sock_dir'])
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'])
return self.list_keys()
def reject(self, match=None, match_dict=None, include_accepted=False):
@ -812,7 +812,7 @@ class Key(object):
pass
self.check_minion_cache()
if self.opts.get('rotate_aes_key'):
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'], self.opts['sock_dir'])
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'])
return (
self.name_match(match) if match is not None
else self.dict_match(matches)
@ -843,7 +843,7 @@ class Key(object):
pass
self.check_minion_cache()
if self.opts.get('rotate_aes_key'):
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'], self.opts['sock_dir'])
salt.crypt.dropfile(self.opts['cachedir'], self.opts['user'])
return self.list_keys()
def finger(self, match):