From 813651c14b87d30b5f2c028ac7d21d43efb67bb2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 15:59:02 +0100 Subject: [PATCH] allow passing conf_dir instead of cdist-home Signed-off-by: Nico Schottelius --- scripts/cdist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cdist b/scripts/cdist index 2066db55..d5ea06d0 100755 --- a/scripts/cdist +++ b/scripts/cdist @@ -56,9 +56,9 @@ def commandline(): parser['configinstall'] = argparse.ArgumentParser(add_help=False) parser['configinstall'].add_argument('host', nargs='+', help='one or more hosts to operate on') - parser['configinstall'].add_argument('-c', '--cdist-home', - help='Change cdist home (default: .. from bin directory)', - action='store') + parser['configinstall'].add_argument('-c', '--conf-dir', + help='Add configuration directory (can be repeated, last one wins)', + action='append') parser['configinstall'].add_argument('-i', '--initial-manifest', help='Path to a cdist manifest or \'-\' to read from stdin.', dest='manifest', required=False) @@ -172,7 +172,7 @@ def configinstall_onehost(host, args, mode, parallel): remote_copy=args.remote_copy, remote_exec=args.remote_exec, initial_manifest=args.manifest, - base_path=args.cdist_home, + conf_dirs=args.conf_dir, exec_path=sys.argv[0], debug=args.debug)