diff --git a/pillar.example b/pillar.example index cd4e745..ab79860 100644 --- 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 index cc225c1..2b84eec 100644 --- 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 index d0f9555..7e52868 100644 --- a/test/integration/v3000-py2/controls/pkgs_spec.rb +++ b/test/integration/v3000-py2/controls/pkgs_spec.rb @@ -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 diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml index b25e0a9..8d93fc6 100644 --- 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 index 95d22b8..30fc509 100644 --- 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 index d0f9555..7e52868 100644 --- a/test/integration/v3000-py3/controls/pkgs_spec.rb +++ b/test/integration/v3000-py3/controls/pkgs_spec.rb @@ -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 diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml index 3164119..5d32510 100644 --- 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 index 5b16ba4..049bf30 100644 --- 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 index 890ddef..eac9418 100644 --- 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 index b3f7bdb..8961215 100644 --- 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 index e25b7ed..90fdcc5 100644 --- 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 index 0f27eaa..ad1f8c7 100644 --- 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 index 0f27eaa..ad1f8c7 100644 --- 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 index 41aa635..a56a6b4 100644 --- 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 index 1f0ffac..debb31b 100644 --- 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 index 753493e..97724d9 100644 --- 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 index a3aa8d6..b62d373 100644 --- 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 index 6916a6f..0ae3787 100644 --- 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 index f62d876..64e4aec 100644 --- 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 index a8e1ad3..585d256 100644 --- a/test/integration/v3001-py3/controls/pkgs_spec.rb +++ b/test/integration/v3001-py3/controls/pkgs_spec.rb @@ -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 diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml index 9f97ba3..01adc38 100644 --- 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 index a5310f6..81a9f06 100644 --- 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 index 9c3edbb..acee1f7 100644 --- 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 index 2ee236c..e90da68 100644 --- 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 index 35a1bc9..bd69e95 100644 --- 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 index d89d826..c0ec911 100644 --- 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 index 4a3cfb6..e1c55e2 100644 --- 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 index 976c00c..aacd314 100644 --- 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 index 976c00c..aacd314 100644 --- 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 index 624f7e5..8a4bb77 100644 --- 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 index 09a52a2..5c567d7 100644 --- 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 index a6c8a6d..a6b6d24 100644 --- 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 index 46431af..fafd191 100644 --- 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 index fa3e33a..baa32c5 100644 --- 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 index 5c59163..4928d8c 100644 --- 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 index 6224979..606dcc5 100644 --- 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 index db6fb7b..8c57f33 100644 --- 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 index 791f298..207d467 100644 --- a/test/integration/v3002-py3/controls/pkgs_spec.rb +++ b/test/integration/v3002-py3/controls/pkgs_spec.rb @@ -7,7 +7,7 @@ pkgs = 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 index c328151..e613c8f 100644 --- 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 index 58cc040..ee3e26f 100644 --- 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 index 50054f9..f8483fa 100644 --- 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 index 2b02ebe..40d5f71 100644 --- 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 index bc825dd..ff253aa 100644 --- 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 index 8f846c5..3491909 100644 --- 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 diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml index 8a27e5c..61eb6f3 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml index 4d52631..365b91e 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml index 81a55b9..333c6c7 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-34.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/freebsd-11.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml index 58ee588..bc9ea0c 100644 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml +++ b/test/integration/v3002-py3/files/_mapdata/freebsd-11.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/v3002-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml index 364b764..149b4a1 100644 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml +++ b/test/integration/v3002-py3/files/_mapdata/freebsd-12.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/v3002-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml index e096906..97694bc 100644 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml +++ b/test/integration/v3002-py3/files/_mapdata/freebsd-13.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/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml index 6a3416d..daba38c 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml index 6a3416d..daba38c 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/openbsd-6.yaml b/test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml index 4c8ef9d..4279c6c 100644 --- a/test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml index 72411fe..314a9fc 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml index 387251b..7a20fe0 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml index 9acc154..f95b9eb 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml index 7cf3aea..a1a0542 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml index 839de40..3f811a8 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml index 850df81..0c5672c 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml index f4a12e6..15d3b76 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3002-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/files/_mapdata/windows-10.yaml b/test/integration/v3002-py3/files/_mapdata/windows-10.yaml index c13606a..b4c02e4 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-10.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-10.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/v3002-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml index a9396b9..2d29555 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-2016-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/v3002-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml index df3a49a..55e2033 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/v3002-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/v3002-py3/files/_mapdata/windows-8.yaml b/test/integration/v3002-py3/files/_mapdata/windows-8.yaml index c2e81af..df69b37 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-8.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/v3003-py3/controls/pkgs_spec.rb b/test/integration/v3003-py3/controls/pkgs_spec.rb index f721d1c..75df0bc 100644 --- a/test/integration/v3003-py3/controls/pkgs_spec.rb +++ b/test/integration/v3003-py3/controls/pkgs_spec.rb @@ -7,7 +7,7 @@ pkgs = when /bsd$/ %w[py38-salt] when 'windows' - %w[Salt\ Minion] + ['Salt Minion'] else %w[salt-master salt-minion] end diff --git a/test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml b/test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml index f4cc5f1..cb09ac5 100644 --- a/test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml +++ b/test/integration/v3003-py3/files/_mapdata/almalinux-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/v3003-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml index 50b9765..e799cb2 100644 --- a/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/arch-base-latest.yaml b/test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml index f88f990..e14e75c 100644 --- a/test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/centos-7.yaml b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml index f268864..27384e1 100644 --- a/test/integration/v3003-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/centos-8.yaml b/test/integration/v3003-py3/files/_mapdata/centos-8.yaml index 8812b2b..720533a 100644 --- a/test/integration/v3003-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/debian-10.yaml b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml index 8ba4d3b..59b87ff 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/debian-9.yaml b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml index cc943dc..5857760 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml index 5268881..1df4621 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml index 09bbae5..b8b3ea4 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml index bd37849..e5de1bb 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml +++ b/test/integration/v3003-py3/files/_mapdata/fedora-34.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/v3003-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml index f413503..91198a8 100644 --- a/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-11.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/v3003-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml index a30de4a..7636e9a 100644 --- a/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-12.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/v3003-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml index 06e7de0..f94035a 100644 --- a/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-13.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/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml index b5cbfc5..bc68d65 100644 --- a/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml index b5cbfc5..bc68d65 100644 --- a/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml index 73c5c5c..1ba3f72 100644 --- a/test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml index c7c1b23..135d277 100644 --- a/test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml index d5c555b..2d73683 100644 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml index d5335cc..b676d6a 100644 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml index 4eb7f7a..8dc4437 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml index 2e086e8..7c58efa 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/windows-10.yaml b/test/integration/v3003-py3/files/_mapdata/windows-10.yaml index 75e8fd1..8facd4a 100644 --- a/test/integration/v3003-py3/files/_mapdata/windows-10.yaml +++ b/test/integration/v3003-py3/files/_mapdata/windows-10.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/v3003-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml index 122f6d6..d67bd4e 100644 --- a/test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/v3003-py3/files/_mapdata/windows-2016-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/v3003-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml index 6369515..b3c8e5e 100644 --- a/test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/v3003-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/v3003-py3/files/_mapdata/windows-8.yaml b/test/integration/v3003-py3/files/_mapdata/windows-8.yaml index 8eaaf3a..cbc4dda 100644 --- a/test/integration/v3003-py3/files/_mapdata/windows-8.yaml +++ b/test/integration/v3003-py3/files/_mapdata/windows-8.yaml @@ -72,7 +72,7 @@ values: fileserver_backend: - rootfs master: localhost - master_type: true + master_type: str pillar_roots: base: - "/srv/pillar"