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

Wrap all remote commands in sh

Browse source
This commit is contained in:
Daniel Hokka Zakrisson 2012-11-22 20:06:30 +01:00
parent 8e515c0c94
commit ddef608c94
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/runner/connection_plugins/paramiko_ssh.py
View file

@ -125,10 +125,11 @@ class Connection(object):
prompt = '[sudo via ansible, key=%s] password: ' % randbits prompt = '[sudo via ansible, key=%s] password: ' % randbits
sudocmd = 'sudo -k && sudo -p "%s" -u %s /bin/sh -c %s' % ( sudocmd = 'sudo -k && sudo -p "%s" -u %s /bin/sh -c %s' % (
prompt, sudo_user, pipes.quote(cmd)) prompt, sudo_user, pipes.quote(cmd))
vvv("EXEC %s" % sudocmd, host=self.host) shcmd = '/bin/sh -c ' + pipes.quote(sudocmd)
vvv("EXEC %s" % shcmd, host=self.host)
sudo_output = '' sudo_output = ''
try: try:
chan.exec_command(sudocmd) chan.exec_command(shcmd)
if self.runner.sudo_pass: if self.runner.sudo_pass:
while not sudo_output.endswith(prompt): while not sudo_output.endswith(prompt):
chunk = chan.recv(bufsize) chunk = chan.recv(bufsize)

7
lib/ansible/runner/connection_plugins/ssh.py
View file

@ -93,10 +93,8 @@ class Connection(object):
prompt = '[sudo via ansible, key=%s] password: ' % randbits prompt = '[sudo via ansible, key=%s] password: ' % randbits
sudocmd = 'sudo -k && sudo -p "%s" -u %s /bin/sh -c %s' % ( sudocmd = 'sudo -k && sudo -p "%s" -u %s /bin/sh -c %s' % (
prompt, sudo_user, pipes.quote(cmd)) prompt, sudo_user, pipes.quote(cmd))
sudo_output = '' cmd = sudocmd
ssh_cmd.append(sudocmd) ssh_cmd.append('/bin/sh -c ' + pipes.quote(cmd))
else:
ssh_cmd.append(cmd)
vvv("EXEC %s" % ssh_cmd, host=self.host) vvv("EXEC %s" % ssh_cmd, host=self.host)
p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE, p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
@ -107,6 +105,7 @@ class Connection(object):
if self.runner.sudo and sudoable and self.runner.sudo_pass: if self.runner.sudo and sudoable and self.runner.sudo_pass:
fcntl.fcntl(p.stdout, fcntl.F_SETFL, fcntl.fcntl(p.stdout, fcntl.F_SETFL,
fcntl.fcntl(p.stdout, fcntl.F_GETFL) | os.O_NONBLOCK) fcntl.fcntl(p.stdout, fcntl.F_GETFL) | os.O_NONBLOCK)
sudo_output = ''
while not sudo_output.endswith(prompt): while not sudo_output.endswith(prompt):
rfd, wfd, efd = select.select([p.stdout], [], rfd, wfd, efd = select.select([p.stdout], [],
[p.stdout], self.runner.timeout) [p.stdout], self.runner.timeout)