stephan/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

name parameter correctly add_conf_dirs

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-11-01 14:14:52 +01:00
commit 6ecfb28d93
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cdist/context.py
View file

@ -38,7 +38,7 @@ class Context(object):
remote_copy, remote_copy,
remote_exec, remote_exec,
initial_manifest=False, initial_manifest=False,
conf_dirs=[], add_conf_dirs=[],
exec_path=sys.argv[0], exec_path=sys.argv[0],
debug=False): debug=False):
@ -59,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, conf_dirs, self.out_path, self.exec_path) self.local = local.Local(self.target_host, self.out_path, self.exec_path, add_conf_dirs=add_conf_dirs)
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"))

2
scripts/cdist
View file

@ -172,7 +172,7 @@ def configinstall_onehost(host, args, mode, parallel):
remote_copy=args.remote_copy, remote_copy=args.remote_copy,
remote_exec=args.remote_exec, remote_exec=args.remote_exec,
initial_manifest=args.manifest, initial_manifest=args.manifest,
conf_dirs=args.conf_dir, add_conf_dirs=args.conf_dir,
exec_path=sys.argv[0], exec_path=sys.argv[0],
debug=args.debug) debug=args.debug)