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

update cmd parser to use the client config func

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-06 23:11:30 -06:00
parent fa2c84317d
commit 9a59b76c21
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config.py
View File

@ -340,13 +340,13 @@ def master_config(path):
return opts
def client_config(mdir):
def client_config(path):
'''
Load in the configuration data needed for the LocalClient. This function
searches for client specific configurations and adds them to the data from
the master configuration.
'''
opts = master_config(mdir)
opts = master_config(path)
cpath = os.path.expanduser('~/.salt')
load_config(opts, cpath, 'SALT_CLIENT_CONFIG')
if 'token_file' in opts:

2
salt/utils/parsers.py
View File

@ -753,7 +753,7 @@ class SaltCMDOptionParser(OptionParser, ConfigDirMixIn, TimeoutMixIn,
self.config['arg'] = self.args[2:]
def setup_config(self):
return config.master_config(self.get_config_file_path('master'))
return config.client_config(self.get_config_file_path('master'))
class SaltCPOptionParser(OptionParser, ConfigDirMixIn, TimeoutMixIn,