2
0

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
commit 0f725810c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
90 changed files with 90 additions and 90 deletions

View File

@ -173,7 +173,7 @@ salt:
minion: minion:
# standalone setup # standalone setup
master_type: false # see init.sls & standalone.sls master_type: str # see init.sls & standalone.sls
# single master setup # single master setup
master: salt master: salt

View File

@ -58,7 +58,7 @@ salt:
master: master:
gitfs_provider: gitpython gitfs_provider: gitpython
minion: minion:
master_type: true # see init.sls & standalone.sls master_type: str # see init.sls & standalone.sls
gitfs: gitfs:
dulwich: dulwich:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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