mirror of https://github.com/ansible/ansible.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
f68330acb2
* Fix vault --ask-vault-pass with no tty
2.4.0 added a check for isatty() that would skip setting up interactive
vault password prompts if not running on a tty.
But... getpass.getpass() will fallback to reading from stdin if
it gets that far without a tty. Since 2.4.0 skipped the interactive
prompts / getpass.getpass() in that case, it would never get a chance
to fall back to stdin.
So if 'echo $VAULT_PASSWORD| ansible-playbook --ask-vault-pass site.yml'
was ran without a tty (ie, from a jenkins job or via the vagrant
ansible provisioner) the 2.4 behavior was different than 2.3. 2.4
would never read the password from stdin, resulting in a vault password
error like:
ERROR! Attempting to decrypt but no vault secrets found
Fix is just to always call the interactive password prompts based
on getpass.getpass() on --ask-vault-pass or --vault-id @prompt and
let getpass sort it out.
* up test_prompt_no_tty to expect prompt with no tty
We do call the PromptSecret class if there is no tty, but
we are back to expecting it to read from stdin in that case.
* Fix logic for when to auto-prompt vault pass
If --ask-vault-pass is used, then pretty much always
prompt.
If it is not used, then prompt if there are no other
vault ids provided and 'auto_prompt==True'.
Fixes vagrant bug https://github.com/hashicorp/vagrant/issues/9033
Fixes #30993
(cherry picked from commit
|
8 years ago | |
|---|---|---|
| .. | ||
| cli | 8 years ago | |
| contrib | 9 years ago | |
| errors | 9 years ago | |
| executor | 8 years ago | |
| inventory | 9 years ago | |
| inventory_test_data/group_vars | 11 years ago | |
| mock | 9 years ago | |
| module_utils | 8 years ago | |
| modules | 8 years ago | |
| parsing | 8 years ago | |
| playbook | 8 years ago | |
| plugins | 8 years ago | |
| template | 8 years ago | |
| utils | 9 years ago | |
| vars | 8 years ago | |
| __init__.py | 9 years ago | |
| ansible.cfg | 8 years ago | |
| conftest.py | 9 years ago | |
| test_constants.py | 9 years ago | |