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
90 changed files with 90 additions and 90 deletions
+1 -1
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
+1 -1
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:
@@ -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
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -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
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -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
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -7,7 +7,7 @@ pkgs =
when /bsd$/
%w[py38-salt]
when 'windows'
%w[Salt\ Minion]
['Salt Minion']
else
%w[salt-master salt-minion]
end
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -7,7 +7,7 @@ pkgs =
when /bsd$/
%w[py38-salt]
when 'windows'
%w[Salt\ Minion]
['Salt Minion']
else
%w[salt-master salt-minion]
end
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -73,7 +73,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -74,7 +74,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- /srv/pillar
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"
@@ -72,7 +72,7 @@ values:
fileserver_backend:
- rootfs
master: localhost
master_type: true
master_type: str
pillar_roots:
base:
- "/srv/pillar"