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

fix(Defaults) master_type: str

pillar.example

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

salt/defaults.yaml

   master:
     gitfs_provider: gitpython
   minion:
-    master_type: true  # see init.sls & standalone.sls
+    master_type: str  # see init.sls & standalone.sls
 
   gitfs:
     dulwich:

test/integration/v3000-py2/controls/pkgs_spec.rb

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

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

test/integration/v3000-py3/controls/pkgs_spec.rb

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

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

test/integration/v3001-py3/controls/pkgs_spec.rb

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

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

test/integration/v3002-py3/controls/pkgs_spec.rb

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

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

test/integration/v3003-py3/controls/pkgs_spec.rb

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

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - /srv/pillar

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"

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

       fileserver_backend:
       - rootfs
       master: localhost
-      master_type: true
+      master_type: str
       pillar_roots:
         base:
         - "/srv/pillar"