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

Merge pull request #3337 from s0undt3ch/develop

Browse Source 
`client_config` should also support receiving it's own defaults.
This commit is contained in:
Thomas S Hatch 2013-01-19 21:55:22 -08:00
commit b945f64236
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
salt/config.py
View File

@ -521,19 +521,44 @@ def apply_master_config(overrides=None, defaults=None):
return opts
def client_config(path, env_var='SALT_CLIENT_CONFIG'):
def client_config(path, env_var='SALT_CLIENT_CONFIG', defaults=None):
'''
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 = {'token_file': os.path.expanduser('~/.salt_token')}
opts.update(master_config(path))
cpath = os.path.expanduser('~/.salt')
opts.update(load_config(cpath, env_var))
if defaults is None:
defaults = DEFAULT_MASTER_OPTS
# Get the token file path from the provided defaults. If not found, specify
# our own, sane, default
opts = {
'token_file': defaults.get(
'token_file',
os.path.expanduser('~/.salt_token')
)
}
# Update options with the master configuration, either from the provided
# path, salt's defaults or provided defaults
opts.update(
master_config(path, defaults=defaults)
)
# Update with the users salt dot file or with the environment variable
opts.update(
load_config(
os.path.expanduser('~/.salt'), env_var
)
)
# Make sure we have a proper and absolute path to the token file
if 'token_file' in opts:
opts['token_file'] = os.path.expanduser(opts['token_file'])
opts['token_file'] = os.path.abspath(
os.path.expanduser(
opts['token_file']
)
)
# If the token file exists, read and store the contained token
if os.path.isfile(opts['token_file']):
with salt.utils.fopen(opts['token_file']) as fp_:
opts['token'] = fp_.read().strip()
# Return the client options
return opts