allow passing conf_dir instead of cdist-home
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
parent
18c0c937dd
commit
813651c14b
1 changed files with 4 additions and 4 deletions
|
@ -56,9 +56,9 @@ def commandline():
|
||||||
parser['configinstall'] = argparse.ArgumentParser(add_help=False)
|
parser['configinstall'] = argparse.ArgumentParser(add_help=False)
|
||||||
parser['configinstall'].add_argument('host', nargs='+',
|
parser['configinstall'].add_argument('host', nargs='+',
|
||||||
help='one or more hosts to operate on')
|
help='one or more hosts to operate on')
|
||||||
parser['configinstall'].add_argument('-c', '--cdist-home',
|
parser['configinstall'].add_argument('-c', '--conf-dir',
|
||||||
help='Change cdist home (default: .. from bin directory)',
|
help='Add configuration directory (can be repeated, last one wins)',
|
||||||
action='store')
|
action='append')
|
||||||
parser['configinstall'].add_argument('-i', '--initial-manifest',
|
parser['configinstall'].add_argument('-i', '--initial-manifest',
|
||||||
help='Path to a cdist manifest or \'-\' to read from stdin.',
|
help='Path to a cdist manifest or \'-\' to read from stdin.',
|
||||||
dest='manifest', required=False)
|
dest='manifest', required=False)
|
||||||
|
@ -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,
|
||||||
base_path=args.cdist_home,
|
conf_dirs=args.conf_dir,
|
||||||
exec_path=sys.argv[0],
|
exec_path=sys.argv[0],
|
||||||
debug=args.debug)
|
debug=args.debug)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue