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
commit fe91f7b506
6 changed files with 34 additions and 63 deletions

View file

@ -25,7 +25,6 @@ from ansible.errors import AnsibleError, AnsibleOptionsError
from ansible.parsing.vault import VaultEditor
from ansible.cli import CLI
from ansible.utils.display import Display
from ansible.utils.vault import read_vault_file
class VaultCLI(CLI):
""" Vault command line class """
@ -74,7 +73,7 @@ class VaultCLI(CLI):
if self.options.vault_password_file:
# read vault_pass from a file
self.vault_pass = read_vault_file(self.options.vault_password_file)
self.vault_pass = read_vault_password_file(self.options.vault_password_file)
elif self.options.ask_vault_pass:
self.vault_pass, _= self.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=False, confirm_new=False)