Skip to content

Commit

Permalink
allow passing conf_dir instead of cdist-home
Browse files Browse the repository at this point in the history
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
  • Loading branch information
Nico Schottelius committed Oct 30, 2012
1 parent 18c0c93 commit 813651c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/cdist
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 813651c

Please sign in to comment.