saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #281 from vermut/patch-1

Browse Source 
Fixes jinja in include block
This commit is contained in:
Niels Abspoel 2017-01-22 23:37:28 +01:00 committed by GitHub
commit 2e792584d2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/files/minion.d/f_defaults.conf
View File

@ -340,25 +340,25 @@ mine_functions:
# #
# Include a config file from some other path: # Include a config file from some other path:
{% if 'include' in cfg_minion -%} {% if 'include' in cfg_minion -%}
{%- do default_keys.append('include') %} {% do default_keys.append('include') -%}
{% if isinstance(cfg_minion['include'], list) -%} {% if cfg_minion['include'] is iterable and cfg_minion['include'] is not string -%}
include: include:
{% for include in cfg_minion['include'] -%} {%- for include in cfg_minion['include'] %}
- {{ include }} - {{ include }}
{% endfor -%} {%- endfor -%}
{% else -%} {% else -%}
include: cfg_minion['include'] include: {{ cfg_minion['include'] }}
{% endif -%} {%- endif -%}
{% elif 'include' in cfg_salt -%} {% elif 'include' in cfg_salt -%}
{% if isinstance(cfg_salt['include'], list) -%} {% if cfg_salt['include'] is iterable and cfg_salt['include'] is not string -%}
include: include:
{% for include in cfg_salt['include'] -%} {%- for include in cfg_salt['include'] %}
- {{ include }} - {{ include }}
{% endfor -%} {%- endfor -%}
{% else -%} {% else -%}
include: cfg_salt['include'] include: {{ cfg_salt['include'] }}
{% endif -%} {%- endif -%}
{% endif -%} {% endif %}
##### Minion module management ##### ##### Minion module management #####
########################################## ##########################################