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

now check stderr also on become for ssh plugin for the cases where sudo or su do not want to prompt/echo on stdin

Browse source 
fixes #11796
This commit is contained in:
Brian Coca 2015-07-30 13:11:41 -04:00
parent 17f659a143
commit b2dc66c7ea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/connections/ssh.py
View file

@ -377,7 +377,7 @@ class Connection(ConnectionBase):
become_errput = '' become_errput = ''
while True: while True:
self._display.debug('Waiting for Privilege Escalation input') self._display.debug('Waiting for Privilege Escalation input')
if self.check_become_success(become_output) or self.check_password_prompt(become_output): if self.check_become_success(become_output + become_errput) or self.check_password_prompt(become_output + become_errput):
break break
rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout], self._play_context.timeout) rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout], self._play_context.timeout)
@ -398,7 +398,7 @@ class Connection(ConnectionBase):
if not chunk: if not chunk:
raise AnsibleError('Connection closed waiting for privilege escalation password prompt: %s ' % become_output) raise AnsibleError('Connection closed waiting for privilege escalation password prompt: %s ' % become_output)
if not self.check_become_success(become_output): if not self.check_become_success(become_output + become_errput):
self._display.debug("Sending privilege escalation password.") self._display.debug("Sending privilege escalation password.")
stdin.write(self._play_context.become_pass + '\n') stdin.write(self._play_context.become_pass + '\n')
else: else: