From e84713c76cdf052935c45134876e3d3471fb89d6 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 17 Feb 2017 16:35:32 -0500 Subject: [PATCH] Revert "Remove the --nspawn-extra-args cli option" This reverts commit b8125ac1a61f2c7d1de821c78c884560071895f1. --- lib/ansible/cli/__init__.py | 2 ++ lib/ansible/plugins/connection/nspawn.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index 932093e2c83..e5f1fc3d039 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -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) diff --git a/lib/ansible/plugins/connection/nspawn.py b/lib/ansible/plugins/connection/nspawn.py index add6599e243..2154c7e6f6e 100644 --- a/lib/ansible/plugins/connection/nspawn.py +++ b/lib/ansible/plugins/connection/nspawn.py @@ -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)