mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Set up user run as key
This commit is contained in:
parent
7ce86d6471
commit
20ecbc6b8a
@ -1034,6 +1034,7 @@ class LocalClient(object):
|
||||
'tcp://{0[interface]}:{0[ret_port]}'.format(self.opts),
|
||||
)
|
||||
payload = sreq.send('clear', payload_kwargs)
|
||||
print payload
|
||||
return {'jid': payload['load']['jid'],
|
||||
'minions': minions}
|
||||
|
||||
|
@ -103,6 +103,9 @@ class SMaster(object):
|
||||
users = []
|
||||
keys = {}
|
||||
acl_users = self.opts['client_acl'].keys()
|
||||
if self.opts.get('user'):
|
||||
acl_users.append(self.opts['user'])
|
||||
else:
|
||||
acl_users.append(getpass.getuser())
|
||||
for user in pwd.getpwall():
|
||||
users.append(user.pw_name)
|
||||
|
Loading…
Reference in New Issue
Block a user