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

fix arg passing in verify_env

Browse Source
This commit is contained in:
Thomas S Hatch 2012-08-14 23:04:56 -06:00
parent cdf5394066
commit 0c9f8bf47d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/__init__.py
View File

@ -44,7 +44,7 @@ class Master(parsers.MasterOptionParser):
],
self.config['user'],
permissive=self.config['permissive_pki_access'],
self.config['pki_dir'],
pki_dir=self.config['pki_dir'],
)
except OSError, err:
sys.exit(err.errno)
@ -90,7 +90,7 @@ class Minion(parsers.MinionOptionParser):
],
self.config['user'],
permissive=self.config['permissive_pki_access'],
self.config['pki_dir'],
pki_dir=self.config['pki_dir'],
)
except OSError, err:
sys.exit(err.errno)
@ -132,7 +132,7 @@ class Syndic(parsers.SyndicOptionParser):
],
self.config['user'],
permissive=self.config['permissive_pki_access'],
self.config['pki_dir'],
pki_dir=self.config['pki_dir'],
)
except OSError, err:
sys.exit(err.errno)

4
salt/cli/__init__.py
View File

@ -171,7 +171,7 @@ class SaltKey(parsers.SaltKeyOptionParser):
],
self.config['user'],
permissive=self.config['permissive_pki_access'],
self.config['pki_dir'],
pki_dir=self.config['pki_dir'],
)
self.setup_logfile_logger()
@ -199,7 +199,7 @@ class SaltCall(parsers.SaltCallOptionParser):
],
self.config['user'],
permissive=self.config['permissive_pki_access'],
self.config['pki_dir'],
pki_dir=self.config['pki_dir'],
)
caller = salt.cli.caller.Caller(self.config)