From 1727fddf504e5efcdcc9137e036175bd98b8ac21 Mon Sep 17 00:00:00 2001 From: Thomas Omans Date: Wed, 19 Mar 2014 10:09:41 -0700 Subject: [PATCH] Allow vault encrypted vars as extra_vars Forward the vault_password to the yaml file utility. --- bin/ansible-playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index be178a6565c..e55e8b0a3fd 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -137,7 +137,7 @@ def main(args): for extra_vars_opt in options.extra_vars: if extra_vars_opt.startswith("@"): # Argument is a YAML file (JSON is a subset of YAML) - extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml_from_file(extra_vars_opt[1:])) + extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml_from_file(extra_vars_opt[1:], vault_password=vault_pass)) elif extra_vars_opt and extra_vars_opt[0] in '[{': # Arguments as YAML extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt))