moved read_vault_file to CLI from utils and renamed to clearer read_vault_password_file

This commit is contained in:
Brian Coca 2015-07-11 14:24:45 -04:00
parent e4097ed279
commit fe91f7b506
6 changed files with 34 additions and 63 deletions

View file

@ -34,7 +34,6 @@ from ansible.playbook.task import Task
from ansible.utils.display import Display
from ansible.utils.unicode import to_unicode
from ansible.utils.vars import combine_vars
from ansible.utils.vault import read_vault_file
from ansible.vars import VariableManager
#---------------------------------------------------------------------------------------------------
@ -98,7 +97,7 @@ class PlaybookCLI(CLI):
if self.options.vault_password_file:
# read vault_pass from a file
vault_pass = read_vault_file(self.options.vault_password_file)
vault_pass = CLI.read_vault_password_file(self.options.vault_password_file)
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]