Merge pull request #28280 from 0xf10e/patch-1

Correct Jinja function load_* to import_*
This commit is contained in:
Justin Findlay 2015-10-24 22:11:10 -06:00
commit e3eff9b909

View File

@ -414,13 +414,17 @@ from the Salt Master. For example:
{% set some_data = salt.pillar.get('some_data', {'sane default': True}) %}
{# or #}
{% import_yaml 'path/to/file.yaml' as some_data %}
{# or #}
{% load_json 'path/to/file.json' as some_data %}
{% import_json 'path/to/file.json' as some_data %}
{# or #}
{% load_text 'path/to/ssh_key.pub' as ssh_pub_key %}
{% import_text 'path/to/ssh_key.pub' as ssh_pub_key %}
{# or #}