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

fix(Defaults) master_type: str
saltstack-formulas · Sep 4, 2021 · 0f72581 · 0f72581
2 parents bd34588 + c16e7a3
commit 0f72581
Show file tree

Hide file tree

Showing 90 changed files with 90 additions and 90 deletions.
diff --git a/pillar.example b/pillar.example
@@ -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

diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -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:

diff --git a/test/integration/v3000-py2/controls/pkgs_spec.rb b/test/integration/v3000-py2/controls/pkgs_spec.rb
@@ -7,7 +7,7 @@
   when /bsd$/
     %w[py38-salt-3002.6]
   when 'windows'
-    %w[Salt\ Minion]
+    ['Salt Minion']
   else
     %w[salt-master salt-minion]
   end

diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb
@@ -7,7 +7,7 @@
   when /bsd$/
     %w[py38-salt-3002.6]
   when 'windows'
-    %w[Salt\ Minion]
+    ['Salt Minion']
   else
     %w[salt-master salt-minion]
   end

diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

diff --git a/test/integration/v3001-py3/controls/pkgs_spec.rb b/test/integration/v3001-py3/controls/pkgs_spec.rb
@@ -7,7 +7,7 @@
   when /bsd$/
     %w[py38-salt-3002.6]
   when 'windows'
-    %w[Salt\ Minion]
+    ['Salt Minion']
   else
     %w[salt-master salt-minion]
   end

diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml b/test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml
@@ -72,7 +72,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/controls/pkgs_spec.rb b/test/integration/v3002-py3/controls/pkgs_spec.rb
@@ -7,7 +7,7 @@
   when /bsd$/
     %w[py38-salt]
   when 'windows'
-    %w[Salt\ Minion]
+    ['Salt Minion']
   else
     %w[salt-master salt-minion]
   end

diff --git a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml b/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml
@@ -73,7 +73,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml
@@ -74,7 +74,7 @@ values:
       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar