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

Merge pull request #13297 from amenonsen/ssh-escalation

Browse source 
Explicitly accept become_success in awaiting_prompt state
This commit is contained in:
James Cammarata 2015-11-28 10:03:00 -05:00
commit a7f7f8bd29
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/connection/ssh.py
View file

@ -457,12 +457,17 @@ class Connection(ConnectionBase):
tmp_stdout = tmp_stderr = '' tmp_stdout = tmp_stderr = ''
# If we see a privilege escalation prompt, we send the password. # If we see a privilege escalation prompt, we send the password.
# (If we're expecting a prompt but the escalation succeeds, we
# didn't need the password and can carry on regardless.)
if states[state] == 'awaiting_prompt' and self._flags['become_prompt']: if states[state] == 'awaiting_prompt':
if self._flags['become_prompt']:
display.debug('Sending become_pass in response to prompt') display.debug('Sending become_pass in response to prompt')
stdin.write(self._play_context.become_pass + '\n') stdin.write(self._play_context.become_pass + '\n')
self._flags['become_prompt'] = False self._flags['become_prompt'] = False
state += 1 state += 1
elif self._flags['become_success']:
state += 1
# We've requested escalation (with or without a password), now we # We've requested escalation (with or without a password), now we
# wait for an error message or a successful escalation. # wait for an error message or a successful escalation.