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

modified the verify_env method to be a function

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-04 10:22:15 -07:00
parent 03a871ab90
commit cb5b6cb0db
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/__init__.py
View file

@ -10,6 +10,15 @@ import salt.minion
import salt.config
import salt.utils
def verify_env(dirs):
'''
Verify that the named direcotries are in place and that the environment
can shake the salt
'''
for dir_ in dirs:
if not os.path.isdir(dir_):
os.makedirs(dir_)
class Master(object):
'''
Creates a master server
@ -41,19 +50,11 @@ class Master(object):
return cli
def _verify_env(self):
'''
Verify that the named direcotries are in place and that the environment
can shake the salt
'''
if not os.path.isdir(self.opts['cachedir']):
os.makedirs(self.opts['cachedir'])
def start(self):
'''
Run the sequence to start a salt master server
'''
self._verify_env()
verify_env([self.opts['pki_dir'], self.opts['cachedir']])
master = salt.master.Master(self.opts)
if self.cli['daemon']:
salt.utils.daemonize()
@ -95,6 +96,7 @@ class Minion(object):
'''
Execute this method to start up a minion.
'''
verify_env([self.opts['pki_dir'], self.opts['cachedir']])
minion = salt.minion.Minion(self.opts)
if self.cli['daemon']:
salt.utils.daemonize()