Browse Source

fix: revert to using `is mapping` in Jinja2

* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
  `'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
tags/v1.7.5
Dafydd Jones 3 years ago
parent
commit
a89fb3f4aa
52 changed files with 349 additions and 12 deletions
  1. +2
    -4
      salt/files/master.d/f_defaults.conf
  2. +2
    -4
      salt/files/master.d/lxc_profiles.conf
  3. +2
    -4
      salt/files/minion.d/f_defaults.conf
  4. +7
    -0
      test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
  5. +7
    -0
      test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
  6. +7
    -0
      test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml
  7. +7
    -0
      test/integration/v3000-py3/files/_mapdata/centos-7.yaml
  8. +7
    -0
      test/integration/v3000-py3/files/_mapdata/centos-8.yaml
  9. +7
    -0
      test/integration/v3000-py3/files/_mapdata/debian-10.yaml
  10. +7
    -0
      test/integration/v3000-py3/files/_mapdata/debian-9.yaml
  11. +7
    -0
      test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml
  12. +7
    -0
      test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml
  13. +7
    -0
      test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
  14. +7
    -0
      test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml
  15. +7
    -0
      test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
  16. +7
    -0
      test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
  17. +7
    -0
      test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
  18. +7
    -0
      test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml
  19. +7
    -0
      test/integration/v3000-py3/files/_mapdata/windows-8.yaml
  20. +7
    -0
      test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml
  21. +7
    -0
      test/integration/v3001-py3/files/_mapdata/centos-7.yaml
  22. +7
    -0
      test/integration/v3001-py3/files/_mapdata/centos-8.yaml
  23. +7
    -0
      test/integration/v3001-py3/files/_mapdata/debian-10.yaml
  24. +7
    -0
      test/integration/v3001-py3/files/_mapdata/debian-9.yaml
  25. +7
    -0
      test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
  26. +7
    -0
      test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
  27. +7
    -0
      test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml
  28. +7
    -0
      test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml
  29. +7
    -0
      test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
  30. +7
    -0
      test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml
  31. +7
    -0
      test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml
  32. +7
    -0
      test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml
  33. +7
    -0
      test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml
  34. +7
    -0
      test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml
  35. +7
    -0
      test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml
  36. +7
    -0
      test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml
  37. +7
    -0
      test/integration/v3002-py3/files/_mapdata/centos-7.yaml
  38. +7
    -0
      test/integration/v3002-py3/files/_mapdata/centos-8.yaml
  39. +7
    -0
      test/integration/v3002-py3/files/_mapdata/debian-10.yaml
  40. +7
    -0
      test/integration/v3002-py3/files/_mapdata/debian-9.yaml
  41. +7
    -0
      test/integration/v3002-py3/files/_mapdata/fedora-32.yaml
  42. +7
    -0
      test/integration/v3002-py3/files/_mapdata/fedora-33.yaml
  43. +7
    -0
      test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml
  44. +7
    -0
      test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml
  45. +7
    -0
      test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
  46. +7
    -0
      test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml
  47. +7
    -0
      test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml
  48. +7
    -0
      test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml
  49. +7
    -0
      test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml
  50. +7
    -0
      test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml
  51. +7
    -0
      test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml
  52. +7
    -0
      test/salt/pillar/salt.sls

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

{%- for key in pillar -%} {%- for key in pillar -%}
{%- if pillar[key] is string %} {%- if pillar[key] is string %}
- {{ key }}: {{ pillar[key] }} - {{ key }}: {{ pillar[key] }}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif pillar[key] is iterable and 'dict' not in pillar[key].__class__.__name__ %}
{%- elif pillar[key] is iterable and pillar[key] is not mapping %}
- {{ key }}: - {{ key }}:
{%- 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 %}
- {{ parameter }} - {{ parameter }}
{%- endif %} {%- endif %}
{%- endfor -%} {%- endfor -%}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif 'dict' in pillar[key].__class__.__name__ and pillar[key] is not string %}
{%- elif pillar[key] is mapping and pillar[key] is not string %}
- {{ key }}: - {{ key }}:
{%- for parameter in pillar[key] %} {%- for parameter in pillar[key] %}
{{ parameter }}: {{pillar[key][parameter]}} {{ parameter }}: {{pillar[key][parameter]}}

+ 2
- 4
salt/files/master.d/lxc_profiles.conf View File

{%- for prof in cfg_prof %} {%- for prof in cfg_prof %}
{{ prof }}: {{ prof }}:
{%- for conf in cfg_prof[prof] %} {%- for conf in cfg_prof[prof] %}
{#- Workaround for missing `is mapping` on CentOS 6, see #193 #}
{%- if 'dict' in cfg_prof[prof][conf].__class__.__name__ %}
{%- if cfg_prof[prof][conf] is mapping %}
{{ conf }}: {{ conf }}:
{%- for opt in cfg_prof[prof][conf] %} {%- for opt in cfg_prof[prof][conf] %}
{{ opt }}: {{ cfg_prof[prof][conf][opt] }} {{ opt }}: {{ cfg_prof[prof][conf][opt] }}
{%- for prof in cfg_net %} {%- for prof in cfg_net %}
{{ prof }}: {{ prof }}:
{%- for conf in cfg_net[prof] -%} {%- for conf in cfg_net[prof] -%}
{#- Workaround for missing `is mapping` on CentOS 6, see #193 #}
{%- if 'dict' in cfg_net[prof][conf].__class__.__name__ %}
{%- if cfg_prof[prof][conf] is mapping %}
{{ conf }}: {{ conf }}:
{%- for opt in cfg_net[prof][conf] %} {%- for opt in cfg_net[prof][conf] %}
{{ opt }}: {{ cfg_net[prof][conf][opt] }} {{ opt }}: {{ cfg_net[prof][conf][opt] }}

+ 2
- 4
salt/files/minion.d/f_defaults.conf View File

{%- for key in pillar -%} {%- for key in pillar -%}
{%- if pillar[key] is string %} {%- if pillar[key] is string %}
- {{ key }}: {{ pillar[key] }} - {{ key }}: {{ pillar[key] }}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif pillar[key] is iterable and 'dict' not in pillar[key].__class__.__name__ %}
{%- elif pillar[key] is iterable and pillar[key] is not mapping %}
- {{ key }}: - {{ key }}:
{%- 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 %}
- {{ parameter }} - {{ parameter }}
{%- endif %} {%- endif %}
{%- endfor -%} {%- endfor -%}
{#- Workaround for missing `is mapping` on CentOS 6, see #193: #}
{%- elif 'dict' in pillar[key].__class__.__name__ and pillar[key] is not string %}
{%- elif pillar[key] is mapping and pillar[key] is not string %}
- {{ key }}: - {{ key }}:
{%- for parameter in pillar[key] %} {%- for parameter in pillar[key] %}
{{ parameter }}: {{pillar[key][parameter]}} {{ parameter }}: {{pillar[key][parameter]}}

+ 7
- 0
test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml View File

key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml View File

key_url: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/centos-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/centos-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/debian-10.yaml View File

key_url: https://repo.saltstack.com/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/debian-9.yaml View File

key_url: https://repo.saltstack.com/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml View File

install_packages: true install_packages: true
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 7
- 0
test/integration/v3000-py3/files/_mapdata/windows-8.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- "/srv/salt" - "/srv/salt"

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/centos-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/centos-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/debian-10.yaml View File

key_url: https://repo.saltstack.com/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/debian-9.yaml View File

key_url: https://repo.saltstack.com/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/fedora-32.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/fedora-33.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml View File

install_packages: true install_packages: true
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml View File

install_packages: true install_packages: true
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/centos-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/centos-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/debian-10.yaml View File

key_url: https://repo.saltstack.com/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/debian-9.yaml View File

key_url: https://repo.saltstack.com/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/fedora-32.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/fedora-33.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml View File

version: 0.23.0 version: 0.23.0
install_packages: true install_packages: true
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml View File

install_packages: true install_packages: true
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml View File

install_packages: true install_packages: true
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml View File

install_packages: true install_packages: true
key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

+ 7
- 0
test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml View File

key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

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

pillar_roots: pillar_roots:
base: base:
- /srv/pillar - /srv/pillar
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
minion: minion:
master: localhost master: localhost
fileserver_backend: fileserver_backend:

Loading…
Cancel
Save