evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

initial change to support multiple conf_dirs

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-10-30 15:59:21 +01:00
commit b0e8c23078
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cdist/context.py
View file

@ -38,26 +38,18 @@ class Context(object):
remote_copy, remote_copy,
remote_exec, remote_exec,
initial_manifest=False, initial_manifest=False,
base_path=False, conf_dirs=[],
exec_path=sys.argv[0], exec_path=sys.argv[0],
debug=False): debug=False):
self.debug = debug self.debug = debug
self.target_host = target_host self.target_host = target_host
# Only required for testing
self.exec_path = exec_path self.exec_path = exec_path
# Context logging # Context logging
self.log = logging.getLogger(self.target_host) self.log = logging.getLogger(self.target_host)
self.log.addFilter(self) self.log.addFilter(self)
# Local base directory
self.base_path = (base_path or
os.path.abspath(os.path.join(os.path.dirname(__file__),
os.pardir, os.pardir)))
# Local temp directory # Local temp directory
# FIXME: if __cdist_out_dir can be given from the outside, the same directory will be used for all hosts # FIXME: if __cdist_out_dir can be given from the outside, the same directory will be used for all hosts
if '__cdist_out_dir' in os.environ: if '__cdist_out_dir' in os.environ:
@ -67,7 +59,7 @@ class Context(object):
self.temp_dir = tempfile.mkdtemp() self.temp_dir = tempfile.mkdtemp()
self.out_path = os.path.join(self.temp_dir, "out") self.out_path = os.path.join(self.temp_dir, "out")
self.local = local.Local(self.target_host, self.base_path, self.out_path) self.local = local.Local(self.target_host, self.conf_dirs, self.out_path)
self.initial_manifest = (initial_manifest or self.initial_manifest = (initial_manifest or
os.path.join(self.local.manifest_path, "init")) os.path.join(self.local.manifest_path, "init"))