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

Merge pull request #836 from sfromm/rawfixes

Browse source 
Fixes for raw module usage and failure to open_session()
This commit is contained in:
Michael DeHaan 2012-08-10 17:01:47 -07:00
commit a7415e5409
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/runner/__init__.py
View file

@ -568,7 +568,9 @@ class Runner(object):
module_name = utils.template(self.module_name, inject) module_name = utils.template(self.module_name, inject)
tmp = self._make_tmp_path(conn) tmp = ''
if self.module_name != 'raw':
tmp = self._make_tmp_path(conn)
result = None result = None
handler = getattr(self, "_execute_%s" % self.module_name, None) handler = getattr(self, "_execute_%s" % self.module_name, None)
@ -595,7 +597,8 @@ class Runner(object):
del result.result['daisychain'] del result.result['daisychain']
self._delete_remote_files(conn, tmp) if self.module_name != 'raw':
self._delete_remote_files(conn, tmp)
conn.close() conn.close()
if not result.comm_ok: if not result.comm_ok:

8
lib/ansible/runner/connection/paramiko_ssh.py
View file

@ -84,7 +84,13 @@ class ParamikoConnection(object):
''' run a command on the remote host ''' ''' run a command on the remote host '''
bufsize = 4096 bufsize = 4096
chan = self.ssh.get_transport().open_session() try:
chan = self.ssh.get_transport().open_session()
except Exception, e:
msg = "Failed to open session"
if len(str(e)) > 0:
msg += ": %s" % str(e)
raise errors.AnsibleConnectionFailed(msg)
chan.get_pty() chan.get_pty()
if not self.runner.sudo or not sudoable: if not self.runner.sudo or not sudoable: