Skip to content

Commit

Permalink
Updated Salt instantiation to discern master/minion opts
Browse files Browse the repository at this point in the history
  • Loading branch information
whiteinge committed Dec 24, 2013
1 parent 0e35dc0 commit f95b1eb
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .pythonrc.py
Expand Up @@ -168,11 +168,12 @@ def __init__(self):
except ImportError:
pass
else:
__opts__ = salt.config.client_config(os.environ['SALT_MASTER_CONFIG'])
__opts_master__ = salt.config.master_config(
os.environ['SALT_MASTER_CONFIG'])

# Instantiate LocalClient and RunnerClient
SLC = salt.client.LocalClient()
SRUN = salt.runner.Runner(__opts__)
SLC = salt.client.LocalClient(__opts_master__)
SRUN = salt.runner.Runner(__opts_master__)

if 'SALT_MINION_CONFIG' in os.environ:
try:
Expand Down

0 comments on commit f95b1eb

Please sign in to comment.