archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6585 from eggsby/patch-3

Browse Source 
Allow vault encrypted vars as extra_vars
pull/6870/head
jctanner 11 years ago
parent 5a65dc3b6a 1727fddf50
commit 63f66a0d3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
bin/ansible-playbook
Unescape Escape View File

@ -136,7 +136,7 @@ def main(args):
for extra_vars_opt in options.extra_vars: for extra_vars_opt in options.extra_vars:
if extra_vars_opt.startswith("@"): if extra_vars_opt.startswith("@"):
# Argument is a YAML file (JSON is a subset of YAML) # 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 '[{': elif extra_vars_opt and extra_vars_opt[0] in '[{':
# Arguments as YAML # Arguments as YAML
extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt)) extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt))

Write Preview
Loading…
Cancel
Save