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

Don't request creds if auth with key.

Browse source
This commit is contained in:
Dmitry Kuzmenko 2015-10-29 18:32:58 +03:00
parent d284eb165b
commit b7b5bec309
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cli/__init__.py
View file

@ -139,7 +139,7 @@ class SaltCMD(parsers.SaltCMDOptionParser):
# If using eauth and a token hasn't already been loaded into
# kwargs, prompt the user to enter auth credentials
if 'token' not in kwargs and self.options.eauth:
if 'token' not in kwargs and 'key' not in kwargs and self.options.eauth:
resolver = salt.auth.Resolver(self.config)
res = resolver.cli(self.options.eauth)
if self.options.mktoken and res: