Quellcode durchsuchen

Fixes jinja in include block

Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
tags/v0.57.0
Pavel Veretennikov vor 7 Jahren
Ursprung
Commit
bad783ea28
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
  1. +12
    -12
      salt/files/minion.d/f_defaults.conf

+ 12
- 12
salt/files/minion.d/f_defaults.conf Datei anzeigen

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

##### Minion module management #####
##########################################

Laden…
Abbrechen
Speichern