fix(master): master.d template to support saltclass ext_pillar

saltstack-formulas · Nov 2, 2021 · 52f97f9 · 52f97f9
1 parent 99b1469
commit 52f97f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
@@ -1207,12 +1207,16 @@ ext_pillar:
       {%- for parameter in pillar[key] %}
         {%- if parameter is iterable and parameter is not string %}
         {%- for param, children in parameter.items() %}
+          {%- if children is string %}
+    - {{ param }}: {{ children }}
+          {%- else %}
     - {{ param }}:
           {%- for child in children %}
             {%- for key, value in child.items() %}
       - {{ key }}: {{ value }}
             {%- endfor -%}
           {%- endfor -%}
+          {%- endif -%}
         {%- endfor -%}
         {%- else %}
     - {{ parameter }}

diff --git a/test/salt/pillar/salt.sls b/test/salt/pillar/salt.sls
@@ -18,6 +18,8 @@ salt:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+          - path: /srv/saltclass
   minion:
     master: localhost
     fileserver_backend: