Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #492 from dth202/defaults-patch-1 

fix(Defaults) master_type: str
This commit is contained in:
Imran Iqbal 2021-09-04 21:44:44 +01:00 committed by GitHub
parent bd3458837b c16e7a3b75
commit 0f725810c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
90 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar.example
View File

@ -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

2
salt/defaults.yaml
View File

@ -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:

2
test/integration/v3000-py2/controls/pkgs_spec.rb
View File

@ -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

2
test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/controls/pkgs_spec.rb
View File

@ -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

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/centos-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/debian-10.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/debian-9.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3001-py3/controls/pkgs_spec.rb
View File

@ -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

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/centos-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/debian-10.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/debian-9.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/controls/pkgs_spec.rb
View File

@ -7,7 +7,7 @@ pkgs =
when /bsd$/
%w[py38-salt]
when 'windows'
%w[Salt\ Minion]
['Salt Minion']
else
%w[salt-master salt-minion]
end

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/centos-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/debian-10.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/debian-9.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/fedora-32.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/fedora-33.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/fedora-34.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

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

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3002-py3/files/_mapdata/windows-10.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3002-py3/files/_mapdata/windows-8.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3003-py3/controls/pkgs_spec.rb
View File

@ -7,7 +7,7 @@ pkgs =
when /bsd$/
%w[py38-salt]
when 'windows'
%w[Salt\ Minion]
['Salt Minion']
else
%w[salt-master salt-minion]
end

2
test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/centos-7.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/centos-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/debian-10.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/debian-9.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/fedora-32.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/fedora-33.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/fedora-34.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml
View File

@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar

2
test/integration/v3003-py3/files/_mapdata/windows-10.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"

2
test/integration/v3003-py3/files/_mapdata/windows-8.yaml
View File

@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"