Merge pull request #519 from rfairburn/fix_ext_pillar

Fix: master.d template to support saltclass ext_pillar config
saltstack-formulas · Nov 30, 2021 · 814092b · 814092b
2 parents ddd5a0c + 5b7d7ea
commit 814092b
Show file tree

Hide file tree

Showing 29 changed files with 60 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/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml
@@ -50,6 +50,8 @@ values:
         - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml
@@ -50,6 +50,8 @@ values:
         - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/openbsd-6.yaml b/test/integration/default/files/_mapdata/openbsd-6.yaml
@@ -50,6 +50,8 @@ values:
         - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/openbsd-7.yaml b/test/integration/default/files/_mapdata/openbsd-7.yaml
@@ -50,6 +50,8 @@ values:
         - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -51,6 +51,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -52,6 +52,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -52,6 +52,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: /srv/saltclass
       file_roots:
         base:
         - /srv/salt

diff --git a/test/integration/default/files/_mapdata/windows-10.yaml b/test/integration/default/files/_mapdata/windows-10.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: "/srv/saltclass"
       file_roots:
         base:
         - "/srv/salt"

diff --git a/test/integration/default/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: "/srv/saltclass"
       file_roots:
         base:
         - "/srv/salt"

diff --git a/test/integration/default/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: "/srv/saltclass"
       file_roots:
         base:
         - "/srv/salt"

diff --git a/test/integration/default/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml
@@ -50,6 +50,8 @@ values:
           - /path/to/stack2.cfg
       - reclass:
           inventory_base_uri: /etc/reclass
+      - saltclass:
+        - path: "/srv/saltclass"
       file_roots:
         base:
         - "/srv/salt"

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