ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Remove debug statements (WIP on sudo)

Browse source
This commit is contained in:
Michael DeHaan 2012-03-28 20:58:34 -04:00
parent 4971101f27
commit 7133734d87
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/connection.py
View file

@ -58,27 +58,37 @@ class ParamikoConnection(object):
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try: try:
self.ssh.connect( self.ssh.connect(
self.host, self.host, username=self.runner.remote_user,
username=self.runner.remote_user, allow_agent=True, look_for_keys=True, password=self.runner.remote_pass,
allow_agent=True, timeout=self.runner.timeout, port=self.runner.remote_port
look_for_keys=True,
password=self.runner.remote_pass,
timeout=self.runner.timeout,
port=self.runner.remote_port
) )
except Exception, e: except Exception, e:
if str(e).find("PID check failed") != -1: if str(e).find("PID check failed") != -1:
raise errors.AnsibleError("paramiko version issue, please upgrade paramiko on the machine running ansible") raise errors.AnsibleError("paramiko version issue, please upgrade paramiko on the machine running ansible")
else: else:
raise errors.AnsibleConnectionFailed(str(e)) raise errors.AnsibleConnectionFailed(str(e))
return self return self
def exec_command(self, cmd): def exec_command(self, cmd):
''' run a command on the remote host ''' ''' run a command on the remote host '''
#if not False:
stdin, stdout, stderr = self.ssh.exec_command(cmd) stdin, stdout, stderr = self.ssh.exec_command(cmd)
return (stdin, stdout, stderr) return (stdin, stdout, stderr)
#else:
# sudo_chan = self.ssh.get_transport().open_session()
# sudo_chan = chan.get_pty()
# sudo_chan.exec_command("sudo %s" % cmd)
# output = channel.makefile('rb', -1).readlines()
# if not output:
# output = channel.makefile_stderr('rb', -1).readlines()
# print "DEBUG: output: %s" % output
# channel.close()
# return (None, '', output)
def put_file(self, in_path, out_path): def put_file(self, in_path, out_path):
''' transfer a file from local to remote ''' ''' transfer a file from local to remote '''

2
lib/ansible/runner.py
View file

@ -36,10 +36,8 @@ from ansible import callbacks as ans_callbacks
HAS_ATFORK=True HAS_ATFORK=True
try: try:
print "DEBUG: I have atfork"
from Crypto.Random import atfork from Crypto.Random import atfork
except ImportError: except ImportError:
print "DEBUG: I have no atfork, this won't help my problem"
HAS_ATFORK=False HAS_ATFORK=False
################################################ ################################################