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

Merge pull request #25633 from AkhterAli/2014.7

Browse source 
Update loader.py
This commit is contained in:
Mike Place 2015-07-22 14:02:41 -06:00
commit 9634351fc2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/loader.py
View file

@ -267,7 +267,7 @@ def states(opts, functions, whitelist=None):
import salt.config
import salt.loader
__opts__ salt.config.minion_config('/etc/salt/minion')
__opts__ = salt.config.minion_config('/etc/salt/minion')
statemods = salt.loader.states(__opts__, None)
'''
load = _create_loader(opts, 'states', 'states')
@ -356,7 +356,7 @@ def grains(opts, force_refresh=False):
import salt.config
import salt.loader
__opts__ salt.config.minion_config('/etc/salt/minion')
__opts__ = salt.config.minion_config('/etc/salt/minion')
__grains__ = salt.loader.grains(__opts__)
print __grains__['id']
'''