Browse Source

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

tags/v1.9.8
Robert Fairburn 3 years ago
parent
commit
5b7d7ea70e
No account linked to committer's email address
29 changed files with 60 additions and 0 deletions
  1. +4
    -0
      salt/files/master.d/f_defaults.conf
  2. +2
    -0
      test/integration/default/files/_mapdata/almalinux-8.yaml
  3. +2
    -0
      test/integration/default/files/_mapdata/amazonlinux-2.yaml
  4. +2
    -0
      test/integration/default/files/_mapdata/arch-base-latest.yaml
  5. +2
    -0
      test/integration/default/files/_mapdata/centos-7.yaml
  6. +2
    -0
      test/integration/default/files/_mapdata/centos-8.yaml
  7. +2
    -0
      test/integration/default/files/_mapdata/debian-10.yaml
  8. +2
    -0
      test/integration/default/files/_mapdata/debian-11.yaml
  9. +2
    -0
      test/integration/default/files/_mapdata/debian-9.yaml
  10. +2
    -0
      test/integration/default/files/_mapdata/fedora-33.yaml
  11. +2
    -0
      test/integration/default/files/_mapdata/fedora-34.yaml
  12. +2
    -0
      test/integration/default/files/_mapdata/freebsd-12.yaml
  13. +2
    -0
      test/integration/default/files/_mapdata/freebsd-13.yaml
  14. +2
    -0
      test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
  15. +2
    -0
      test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
  16. +2
    -0
      test/integration/default/files/_mapdata/openbsd-6.yaml
  17. +2
    -0
      test/integration/default/files/_mapdata/openbsd-7.yaml
  18. +2
    -0
      test/integration/default/files/_mapdata/opensuse-15.yaml
  19. +2
    -0
      test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
  20. +2
    -0
      test/integration/default/files/_mapdata/oraclelinux-7.yaml
  21. +2
    -0
      test/integration/default/files/_mapdata/oraclelinux-8.yaml
  22. +2
    -0
      test/integration/default/files/_mapdata/rockylinux-8.yaml
  23. +2
    -0
      test/integration/default/files/_mapdata/ubuntu-18.yaml
  24. +2
    -0
      test/integration/default/files/_mapdata/ubuntu-20.yaml
  25. +2
    -0
      test/integration/default/files/_mapdata/windows-10.yaml
  26. +2
    -0
      test/integration/default/files/_mapdata/windows-2016-server.yaml
  27. +2
    -0
      test/integration/default/files/_mapdata/windows-2019-server.yaml
  28. +2
    -0
      test/integration/default/files/_mapdata/windows-8.yaml
  29. +2
    -0
      test/salt/pillar/salt.sls

+ 4
- 0
salt/files/master.d/f_defaults.conf View File

{%- for parameter in pillar[key] %} {%- for parameter in pillar[key] %}
{%- if parameter is iterable and parameter is not string %} {%- if parameter is iterable and parameter is not string %}
{%- for param, children in parameter.items() %} {%- for param, children in parameter.items() %}
{%- if children is string %}
- {{ param }}: {{ children }}
{%- else %}
- {{ param }}: - {{ param }}:
{%- for child in children %} {%- for child in children %}
{%- for key, value in child.items() %} {%- for key, value in child.items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}
{%- endif -%}
{%- endfor -%} {%- endfor -%}
{%- else %} {%- else %}
- {{ parameter }} - {{ parameter }}

+ 2
- 0
test/integration/default/files/_mapdata/almalinux-8.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/amazonlinux-2.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/arch-base-latest.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/centos-7.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/centos-8.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/debian-10.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/debian-11.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/debian-9.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/fedora-33.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/fedora-34.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/freebsd-12.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/freebsd-13.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/gentoo-2-sysd.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/gentoo-2-sysv.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/openbsd-6.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/openbsd-7.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/opensuse-15.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/oraclelinux-7.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/oraclelinux-8.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/rockylinux-8.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/ubuntu-18.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/ubuntu-20.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 2
- 0
test/integration/default/files/_mapdata/windows-10.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 2
- 0
test/integration/default/files/_mapdata/windows-2016-server.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 2
- 0
test/integration/default/files/_mapdata/windows-2019-server.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 2
- 0
test/integration/default/files/_mapdata/windows-8.yaml View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 2
- 0
test/salt/pillar/salt.sls View File

- /path/to/stack2.cfg - /path/to/stack2.cfg
- reclass: - reclass:
inventory_base_uri: /etc/reclass inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
minion: minion:
master: localhost master: localhost
fileserver_backend: fileserver_backend:

Loading…
Cancel
Save