Set up user run as key

This commit is contained in:
Thomas S Hatch 2012-08-17 21:45:59 -06:00
parent 7ce86d6471
commit 20ecbc6b8a
2 changed files with 5 additions and 1 deletions

View File

@ -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}

View File

@ -103,7 +103,10 @@ class SMaster(object):
users = []
keys = {}
acl_users = self.opts['client_acl'].keys()
acl_users.append(getpass.getuser())
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)
for user in acl_users: