diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2018-01-15 22:35:01 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-01-22 16:54:53 -0800 |
| commit | 340a7be7c382d441475b64adbfd65e605786cd4f (patch) | |
| tree | ea6f96b738e9750f1b274e1c0254c7b419535374 /lib/ansible/parsing | |
| parent | 14c3b4d8e5972fcb81073f634de6f76ec50f662e (diff) | |
| download | ansible-340a7be7c382d441475b64adbfd65e605786cd4f.tar.gz | |
Implement plugin filtering
Diffstat (limited to 'lib/ansible/parsing')
| -rw-r--r-- | lib/ansible/parsing/utils/yaml.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/parsing/utils/yaml.py b/lib/ansible/parsing/utils/yaml.py index de36928c02..82a3d9d6bc 100644 --- a/lib/ansible/parsing/utils/yaml.py +++ b/lib/ansible/parsing/utils/yaml.py @@ -54,7 +54,7 @@ def _safe_load(stream, file_name=None, vault_secrets=None): pass # older versions of yaml don't have dispose function, ignore -def from_yaml(data, file_name='<string>', show_content=True): +def from_yaml(data, file_name='<string>', show_content=True, vault_secrets=None): ''' Creates a python datastructure from the given data, which can be either a JSON or YAML string. @@ -80,7 +80,7 @@ def from_yaml(data, file_name='<string>', show_content=True): except Exception: # must not be JSON, let the rest try try: - new_data = _safe_load(in_data, file_name=file_name) + new_data = _safe_load(in_data, file_name=file_name, vault_secrets=vault_secrets) except YAMLError as yaml_exc: _handle_error(yaml_exc, file_name, show_content) |