Merge branch 'remote_prefix'

This commit is contained in:
Nico Schottelius 2012-05-29 15:41:48 +02:00
commit 7833d4d64c
14 changed files with 131 additions and 31 deletions

View file

@ -69,6 +69,15 @@ def commandline():
help='Operate on multiple hosts sequentially (default)',
action='store_false', dest='parallel')
parser['configinstall'].add_argument('--remote-copy',
help='Command to use for remote copy (should behave like scp)',
action='store', dest='remote_copy',
default="scp -o User=root -q")
parser['configinstall'].add_argument('--remote-exec',
help='Command to use for remote execution (should behave like ssh)',
action='store', dest='remote_exec',
default="ssh -o User=root -q")
# Config
parser['config'] = parser['sub'].add_parser('config',
parents=[parser['loglevel'], parser['configinstall']])
@ -160,6 +169,8 @@ def configinstall_onehost(host, args, mode, parallel):
context = cdist.context.Context(
target_host=host,
remote_copy=args.remote_copy,
remote_exec=args.remote_exec,
initial_manifest=args.manifest,
base_path=args.cdist_home,
exec_path=sys.argv[0],