simplified vault password functions

also fixes #12864
This commit is contained in:
Brian Coca 2015-10-24 15:06:43 -04:00
parent 25e3fe04a8
commit 368f4448dc
4 changed files with 14 additions and 18 deletions

View file

@ -100,7 +100,7 @@ class PlaybookCLI(CLI):
vault_pass = CLI.read_vault_password_file(self.options.vault_password_file, loader=loader)
loader.set_vault_password(vault_pass)
elif self.options.ask_vault_pass:
vault_pass = self.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=False, confirm_new=False)[0]
vault_pass = self.ask_vault_passwords()[0]
loader.set_vault_password(vault_pass)
# initial error check, to make sure all specified playbooks are accessible