Check number of vault secrets after setup. (#30520)

This is to catch vault secrets from config and
cli. Previously vault_password_file in config was
missed since it was added by setup_vault_secrets,
so check after setup_vault_secrets.
pull/30631/head
Adrian Likins 7 years ago committed by GitHub
parent 18582295e3
commit 174cb1f33c

@ -184,6 +184,10 @@ class VaultCLI(CLI):
vault_password_files=self.options.vault_password_files, vault_password_files=self.options.vault_password_files,
ask_vault_pass=self.options.ask_vault_pass, ask_vault_pass=self.options.ask_vault_pass,
create_new_password=True) create_new_password=True)
if len(vault_secrets) > 1:
raise AnsibleOptionsError("Only one --vault-id can be used for encryption. This includes passwords from configuration and cli.")
if not vault_secrets: if not vault_secrets:
raise AnsibleOptionsError("A vault password is required to use Ansible's Vault") raise AnsibleOptionsError("A vault password is required to use Ansible's Vault")

Loading…
Cancel
Save