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

Moved potential circular import into function

Browse Source
This commit is contained in:
Seth House 2013-08-01 12:27:57 -06:00
parent 91cfb7d193
commit c00ecd62ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,13 +43,13 @@ import os
import cherrypy
from . import app
def bootstrap_app():
'''
Grab the opts dict of the master config by trying to import Salt
'''
from . import app
import salt.config
__opts__ = salt.config.client_config(
os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
return app.get_app(__opts__)