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

Vault missing DataLoader for pwd file #12293

Browse source
This commit is contained in:
Blake Atkinson 2015-09-09 15:33:52 -05:00
parent 926f127245
commit 6062519986
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/cli/vault.py
View file

@ -22,6 +22,7 @@ import traceback
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.errors import AnsibleError, AnsibleOptionsError
from ansible.parsing import DataLoader
from ansible.parsing.vault import VaultEditor from ansible.parsing.vault import VaultEditor
from ansible.cli import CLI from ansible.cli import CLI
from ansible.utils.display import Display from ansible.utils.display import Display
@ -82,16 +83,17 @@ class VaultCLI(CLI):
def run(self): def run(self):
super(VaultCLI, self).run() super(VaultCLI, self).run()
loader = DataLoader()
if self.options.vault_password_file: if self.options.vault_password_file:
# read vault_pass from a file # read vault_pass from a file
self.vault_pass = CLI.read_vault_password_file(self.options.vault_password_file) self.vault_pass = CLI.read_vault_password_file(self.options.vault_password_file, loader)
else: else:
self.vault_pass, _= self.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=False, confirm_new=False) self.vault_pass, _= self.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=False, confirm_new=False)
if self.options.new_vault_password_file: if self.options.new_vault_password_file:
# for rekey only # for rekey only
self.new_vault_pass = CLI.read_vault_password_file(self.options.new_vault_password_file) self.new_vault_pass = CLI.read_vault_password_file(self.options.new_vault_password_file, loader)
if not self.vault_pass: if not self.vault_pass:
raise AnsibleOptionsError("A password is required to use Ansible's Vault") raise AnsibleOptionsError("A password is required to use Ansible's Vault")