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

Handle pillar params with child params. (#372)

Browse Source
This commit is contained in:
Matthew Richardson 2018-06-22 09:41:10 +01:00 committed by Niels Abspoel
parent 784e2bc372
commit 1a5027ef8c
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/files/master.d/f_defaults.conf
View File

@ -1168,7 +1168,18 @@ ext_pillar:
{%- elif pillar[key] is iterable and 'dict' not in pillar[key].__class__.__name__ %}
- {{ key }}:
{%- for parameter in pillar[key] %}
{%- if parameter is iterable and parameter is not string %}
{%- for param, children in parameter.items() %}
- {{ param }}:
{%- for child in children %}
{%- for key, value in child.items() %}
- {{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}
{%- endfor -%}
{%- else %}
- {{ parameter }}
{%- endif %}
{%- endfor -%}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif 'dict' in pillar[key].__class__.__name__ and pillar[key] is not string %}

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

@ -842,7 +842,18 @@ ext_pillar:
{%- elif pillar[key] is iterable and 'dict' not in pillar[key].__class__.__name__ %}
- {{ key }}:
{%- for parameter in pillar[key] %}
{%- if parameter is iterable and parameter is not string %}
{%- for param, children in parameter.items() %}
- {{ param }}:
{%- for child in children %}
{%- for key, value in child.items() %}
- {{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}
{%- endfor -%}
{%- else %}
- {{ parameter }}
{%- endif %}
{%- endfor -%}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif 'dict' in pillar[key].__class__.__name__ and pillar[key] is not string %}