diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 1e901bddf..83e6e1851 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1202,8 +1202,7 @@ ext_pillar: {%- for key in pillar -%} {%- if pillar[key] is string %} - {{ 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 }}: {%- for parameter in pillar[key] %} {%- if parameter is iterable and parameter is not string %} @@ -1219,8 +1218,7 @@ ext_pillar: - {{ 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 %} + {%- elif pillar[key] is mapping and pillar[key] is not string %} - {{ key }}: {%- for parameter in pillar[key] %} {{ parameter }}: {{pillar[key][parameter]}} diff --git a/salt/files/master.d/lxc_profiles.conf b/salt/files/master.d/lxc_profiles.conf index 2d453fca4..37415524a 100644 --- a/salt/files/master.d/lxc_profiles.conf +++ b/salt/files/master.d/lxc_profiles.conf @@ -12,8 +12,7 @@ lxc.container_profile: {%- for prof 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 }}: {%- for opt in cfg_prof[prof][conf] %} {{ opt }}: {{ cfg_prof[prof][conf][opt] }} @@ -30,8 +29,7 @@ lxc.network_profile: {%- for prof 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 }}: {%- for opt in cfg_net[prof][conf] %} {{ opt }}: {{ cfg_net[prof][conf][opt] }} diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index 2843faec7..183ff3f67 100644 --- a/salt/files/minion.d/f_defaults.conf +++ b/salt/files/minion.d/f_defaults.conf @@ -838,8 +838,7 @@ ext_pillar: {%- for key in pillar -%} {%- if pillar[key] is string %} - {{ 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 }}: {%- for parameter in pillar[key] %} {%- if parameter is iterable and parameter is not string %} @@ -855,8 +854,7 @@ ext_pillar: - {{ 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 %} + {%- elif pillar[key] is mapping and pillar[key] is not string %} - {{ key }}: {%- for parameter in pillar[key] %} {{ parameter }}: {{pillar[key][parameter]}} diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml index b6b1b9213..c88185648 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml index a1035209f..6ddb6b582 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml index 8c1ab5060..21239a9c4 100644 --- a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml index f914aea6a..3ea4b2dd8 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml index 220f8d0c5..4e3e20914 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml index f8156f9fd..65f419138 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml index 1fe3a40f4..3b4fed127 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml index ab5df2c1f..2e57c3201 100644 --- a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml index ab5df2c1f..2e57c3201 100644 --- a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml index eac6d7602..9b1b79cde 100644 --- a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml index 3ffbc71d5..71c6a0479 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml index 9714b3f60..29b840022 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml index 59ba24bae..00aad2f52 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml index cf323ed97..2baea536e 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml index 02f7fdf4b..4f3b4f3e3 100644 --- a/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - "/srv/salt" diff --git a/test/integration/v3000-py3/files/_mapdata/windows-8.yaml b/test/integration/v3000-py3/files/_mapdata/windows-8.yaml index c8d3a9ec9..befbbef73 100644 --- a/test/integration/v3000-py3/files/_mapdata/windows-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/windows-8.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - "/srv/salt" diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml index 55bb27bdd..7df717edb 100644 --- a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml index 79e6ea22d..88806c02b 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml index f889fd9dc..8d68a74af 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml index 25787ac3b..70682f6ad 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml index 77681320a..331367cb8 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml index 09d424609..be8c9f398 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml index fe38c175d..2a4690eb3 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml index ee199e7f3..9e2168bf1 100644 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml index ee199e7f3..9e2168bf1 100644 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml index 77f83fc60..cbcaf2b66 100644 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml index 9cf2b899c..73f7f5acd 100644 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml index 03d06208e..cb2d895bc 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml index 9c235a937..1027a5cb7 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml index 5bfd225e8..372cd7df4 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml index f0dce2c9f..4a67c3ee6 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml index 83b738de8..ebb0a2193 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml index 5aaec0dd9..245164389 100644 --- a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml index be51c2c9c..e18143084 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml index 6e08e0967..93d8311bf 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml index fb6ee71ff..8d612e48b 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml index 3f3a1342e..b13b12e65 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml index 73dc5b7dc..b71343698 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml index da650eba6..3736f2f80 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml index 613a0a0a4..eff157d22 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml index 613a0a0a4..eff157d22 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -43,6 +43,13 @@ values: version: 0.23.0 install_packages: true 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml index a9f38ed24..1df95c747 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml index f4b3634a5..244d7f2e8 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml index aa123506e..d0407e254 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml index fd68d3bf0..ea2572c19 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml @@ -44,6 +44,13 @@ values: install_packages: true key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml index f86547ca0..2c017d791 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml index d84e7f670..361028c03 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml index ead29baad..acbd77c1a 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml @@ -45,6 +45,13 @@ values: key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 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: base: - /srv/salt diff --git a/test/salt/pillar/salt.sls b/test/salt/pillar/salt.sls index 7af0ae50b..91e0339a3 100644 --- a/test/salt/pillar/salt.sls +++ b/test/salt/pillar/salt.sls @@ -11,6 +11,13 @@ salt: pillar_roots: base: - /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: master: localhost fileserver_backend: