diff options
| author | Thomas Omans <thomas.omans@gmail.com> | 2014-03-19 10:09:41 -0700 |
|---|---|---|
| committer | Thomas Omans <thomas.omans@gmail.com> | 2014-03-19 10:09:41 -0700 |
| commit | 1727fddf504e5efcdcc9137e036175bd98b8ac21 (patch) | |
| tree | a33feaabe64ff75d46c1e5c2a1f4e3858de9a967 /bin | |
| parent | 67517e96d39eb2b694e3c05c0937d9c0414d7e54 (diff) | |
| download | ansible-1727fddf504e5efcdcc9137e036175bd98b8ac21.tar.gz | |
Allow vault encrypted vars as extra_vars
Forward the vault_password to the yaml file utility.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ansible-playbook | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ansible-playbook b/bin/ansible-playbook index be178a6565..e55e8b0a3f 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)) |