gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

generate more efficient commands in the Qubes connection plugin

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2016-08-29 01:55:57 +00:00
parent 3e1674801a
commit 48bdab2b1f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ansible/connection_plugins/qubes.py
View File

@ -6,7 +6,7 @@
import distutils.spawn import distutils.spawn
import traceback import traceback
import os import os
import shutil import shlex
import subprocess import subprocess
import pipes import pipes
from ansible import errors from ansible import errors
@ -85,9 +85,9 @@ class Connection(ConnectionBase):
def _produce_command(self, cmd): def _produce_command(self, cmd):
# FIXME # FIXME
# proxy = ["--proxy=%s" % self._management_proxy] if self._management_proxy else [] # proxy = ["--proxy=%s" % self._management_proxy] if self._management_proxy else []
chroot = self.chroot
if isinstance(cmd, basestring): if isinstance(cmd, basestring):
assert 0, "cannot deal with basestrings like " + cmd unsplit = shlex.split(cmd)
return [self.qrun, self.chroot] + unsplit
#if proxy: #if proxy:
# local_cmd = [self.qrun] + proxy + [chroot] + cmd # local_cmd = [self.qrun] + proxy + [chroot] + cmd
#else: #else:
@ -103,7 +103,7 @@ class Connection(ConnectionBase):
compared to exec_command() it looses some niceties like being able to compared to exec_command() it looses some niceties like being able to
return the process's exit code immediately. return the process's exit code immediately.
''' '''
local_cmd = self._produce_command(["/bin/sh", "-c", cmd]) local_cmd = self._produce_command(cmd)
display.vvv("EXEC %s" % (local_cmd), host=self.chroot) display.vvv("EXEC %s" % (local_cmd), host=self.chroot)
return subprocess.Popen(local_cmd, shell=False, stdin=stdin, return subprocess.Popen(local_cmd, shell=False, stdin=stdin,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
@ -121,11 +121,11 @@ class Connection(ConnectionBase):
super(Connection, self).put_file(in_path, out_path) super(Connection, self).put_file(in_path, out_path)
display.vvv("PUT %s TO %s" % (in_path, out_path), host=self.chroot) display.vvv("PUT %s TO %s" % (in_path, out_path), host=self.chroot)
out_path = pipes.quote(self._prefix_login_path(out_path)) out_path = self._prefix_login_path(out_path)
try: try:
with open(in_path, 'rb') as in_file: with open(in_path, 'rb') as in_file:
try: try:
p = self._buffered_exec_command('dd of=%s bs=%s' % (out_path, BUFSIZE), stdin=in_file) p = self._buffered_exec_command(['dd','of=%s' % out_path, 'bs=%s' % BUFSIZE], stdin=in_file)
except OSError: except OSError:
raise errors.AnsibleError("chroot connection requires dd command in the chroot") raise errors.AnsibleError("chroot connection requires dd command in the chroot")
try: try:
@ -157,10 +157,9 @@ class Connection(ConnectionBase):
super(Connection, self).fetch_file(in_path, out_path) super(Connection, self).fetch_file(in_path, out_path)
display.vvv("FETCH %s TO %s" % (in_path, out_path), host=self.chroot) display.vvv("FETCH %s TO %s" % (in_path, out_path), host=self.chroot)
in_path = pipes.quote(self._prefix_login_path(in_path)) in_path = self._prefix_login_path(in_path)
try: try:
p = self._buffered_exec_command('dd if=%s bs=%s' % (in_path, BUFSIZE)) p = self._buffered_exec_command(['dd', 'if=%s' % in_path, 'bs=%s' % BUFSIZE])
except OSError: except OSError:
raise errors.AnsibleError("Qubes connection requires dd command in the chroot") raise errors.AnsibleError("Qubes connection requires dd command in the chroot")