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

make become prompt method agnostic (#33789)

Browse source 
fixes #33747
This commit is contained in:
Brian Coca 2017-12-13 17:57:06 -05:00 committed by Adrian Likins
parent ad94a3a6a2
commit afa82be019
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/cli/__init__.py
View file

@ -323,11 +323,11 @@ class CLI(with_metaclass(ABCMeta, object)):
try: try:
if op.ask_pass: if op.ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ") sshpass = getpass.getpass(prompt="SSH password: ")
become_prompt = "%s password[defaults to SSH password]: " % op.become_method.upper() become_prompt = "BECOME password[defaults to SSH password]: "
if sshpass: if sshpass:
sshpass = to_bytes(sshpass, errors='strict', nonstring='simplerepr') sshpass = to_bytes(sshpass, errors='strict', nonstring='simplerepr')
else: else:
become_prompt = "%s password: " % op.become_method.upper() become_prompt = "BECOME password: "
if op.become_ask_pass: if op.become_ask_pass:
becomepass = getpass.getpass(prompt=become_prompt) becomepass = getpass.getpass(prompt=become_prompt)