cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Remove the --nspawn-extra-args cli option"

Browse source 
This reverts commit b8125ac1a6.
This commit is contained in:
Brian Coca 2017-02-17 16:35:32 -05:00
parent 2d2874fb3c
commit e84713c76c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/__init__.py
View file

@ -355,6 +355,8 @@ class CLI(with_metaclass(ABCMeta, object)):
help="specify extra arguments to pass to scp only (e.g. -l)")
connect_group.add_option('--ssh-extra-args', default='', dest='ssh_extra_args',
help="specify extra arguments to pass to ssh only (e.g. -R)")
connect_group.add_option('--nspawn-extra-args', default='', dest='nspawn_extra_args',
help="specify extra arguments to pass to systemd-nspawn only (e.g. --bind)")
parser.add_option_group(connect_group)

4
lib/ansible/plugins/connection/nspawn.py
View file

@ -34,6 +34,7 @@ class Connection(ConnectionBase):
*args, **kwargs)
display.vvv("NSPAWN ARGS %s" % self._play_context.nspawn_args)
display.vvv("NSPAWN EXTRA ARGS %s" % self._play_context.nspawn_extra_args)
self.chroot = self._play_context.remote_addr
@ -68,7 +69,8 @@ class Connection(ConnectionBase):
else '/bin/sh')
nspawn_args = shlex.split(self._play_context.nspawn_args)
local_cmd = [self.nspawn_cmd, '-D', self.chroot ] + nspawn_args + [
nspawn_extra_args = shlex.split(self._play_context.nspawn_extra_args)
local_cmd = [self.nspawn_cmd, '-D', self.chroot ] + nspawn_args + nspawn_extra_args + [
'--', executable, '-c', cmd]
display.vvv("EXEC %s" % (local_cmd), host=self.chroot)