Bladeren bron
Merge pull request #492 from dth202/defaults-patch-1
fix(Defaults) master_type: strtags/v1.9.1
Imran Iqbal
3 jaren geleden
90 gewijzigde bestanden met toevoegingen van 90 en 90 verwijderingen
+ 1
- 1
pillar.example
Bestand weergeven
| @@ -173,7 +173,7 @@ salt: | |||
| minion: | |||
| # standalone setup | |||
| master_type: false # see init.sls & standalone.sls | |||
| master_type: str # see init.sls & standalone.sls | |||
| # single master setup | |||
| master: salt | |||
+ 1
- 1
salt/defaults.yaml
Bestand weergeven
| @@ -58,7 +58,7 @@ salt: | |||
| master: | |||
| gitfs_provider: gitpython | |||
| minion: | |||
| master_type: true # see init.sls & standalone.sls | |||
| master_type: str # see init.sls & standalone.sls | |||
| gitfs: | |||
| dulwich: | |||
+ 1
- 1
test/integration/v3000-py2/controls/pkgs_spec.rb
Bestand weergeven
| @@ -7,7 +7,7 @@ pkgs = | |||
| when /bsd$/ | |||
| %w[py38-salt-3002.6] | |||
| when 'windows' | |||
| %w[Salt\ Minion] | |||
| ['Salt Minion'] | |||
| else | |||
| %w[salt-master salt-minion] | |||
| end | |||
+ 1
- 1
test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/controls/pkgs_spec.rb
Bestand weergeven
| @@ -7,7 +7,7 @@ pkgs = | |||
| when /bsd$/ | |||
| %w[py38-salt-3002.6] | |||
| when 'windows' | |||
| %w[Salt\ Minion] | |||
| ['Salt Minion'] | |||
| else | |||
| %w[salt-master salt-minion] | |||
| end | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/centos-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/centos-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/debian-10.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/debian-9.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3001-py3/controls/pkgs_spec.rb
Bestand weergeven
| @@ -7,7 +7,7 @@ pkgs = | |||
| when /bsd$/ | |||
| %w[py38-salt-3002.6] | |||
| when 'windows' | |||
| %w[Salt\ Minion] | |||
| ['Salt Minion'] | |||
| else | |||
| %w[salt-master salt-minion] | |||
| end | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/centos-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/centos-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/debian-10.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/debian-9.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/controls/pkgs_spec.rb
Bestand weergeven
| @@ -7,7 +7,7 @@ pkgs = | |||
| when /bsd$/ | |||
| %w[py38-salt] | |||
| when 'windows' | |||
| %w[Salt\ Minion] | |||
| ['Salt Minion'] | |||
| else | |||
| %w[salt-master salt-minion] | |||
| end | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/centos-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/centos-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/debian-10.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/debian-9.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/fedora-32.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/fedora-33.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/fedora-34.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/windows-10.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3002-py3/files/_mapdata/windows-8.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3003-py3/controls/pkgs_spec.rb
Bestand weergeven
| @@ -7,7 +7,7 @@ pkgs = | |||
| when /bsd$/ | |||
| %w[py38-salt] | |||
| when 'windows' | |||
| %w[Salt\ Minion] | |||
| ['Salt Minion'] | |||
| else | |||
| %w[salt-master salt-minion] | |||
| end | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/centos-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/centos-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/debian-10.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/debian-9.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/fedora-32.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/fedora-33.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/fedora-34.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml
Bestand weergeven
| @@ -73,7 +73,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml
Bestand weergeven
| @@ -74,7 +74,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - /srv/pillar | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/windows-10.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
+ 1
- 1
test/integration/v3003-py3/files/_mapdata/windows-8.yaml
Bestand weergeven
| @@ -72,7 +72,7 @@ values: | |||
| fileserver_backend: | |||
| - rootfs | |||
| master: localhost | |||
| master_type: true | |||
| master_type: str | |||
| pillar_roots: | |||
| base: | |||
| - "/srv/pillar" | |||
Laden…