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

Improve method of grabbing Salt's config for the wsgi app interface

Browse Source
This commit is contained in:
Seth House 2013-07-29 20:46:43 -06:00
parent 712af4c83c
commit 14821f6677
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
saltapi/netapi/rest_cherrypy/wsgi.py
View File

@ -39,6 +39,8 @@ An example Apache virtual host configuration::
'''
# pylint: disable=C0103
import os
import cherrypy
from . import app
@ -47,9 +49,11 @@ def bootstrap_app():
'''
Grab the opts dict of the master config by trying to import Salt
'''
import salt.client
opts = salt.client.LocalClient().opts
return app.get_app(opts)
import salt.config
__opts__ = salt.config.client_config(
os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
return app.get_app(__opts__)
def get_application(*args):
'''