diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml index b25e0a977..8d93fc602 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 95d22b85e..30fc509f1 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/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml index 316411901..5d325100a 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 5b16ba421..049bf301d 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 890ddef63..eac9418fa 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 b3f7bdb4a..8961215c0 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 e25b7edae..90fdcc53b 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 0f27eaaec..ad1f8c712 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 0f27eaaec..ad1f8c712 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 41aa635f2..a56a6b440 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 1f0ffac1e..debb31bb3 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 753493e30..97724d9fd 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 a3aa8d637..b62d3736f 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 6916a6f7a..0ae3787fa 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 f62d8767d..64e4aecd8 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/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml index 9f97ba3d7..01adc3808 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 a5310f6e1..81a9f060c 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 9c3edbb95..acee1f777 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 2ee236c2b..e90da6855 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 35a1bc9cc..bd69e95fc 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 d89d82662..c0ec911fc 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 4a3cfb6cc..e1c55e248 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 976c00c72..aacd314e9 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 976c00c72..aacd314e9 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 624f7e5ae..8a4bb7739 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 09a52a2bc..5c567d7e9 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 a6c8a6daa..a6b6d24a7 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 46431afe6..fafd19101 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 fa3e33aa7..baa32c5f6 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 5c5916379..4928d8cdc 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 6224979ec..606dcc551 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 db6fb7bc2..8c57f33ba 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/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml index c3281510b..e613c8f56 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 58cc0403d..ee3e26fae 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 50054f949..f8483fa72 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 2b02ebe57..40d5f71e5 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 bc825ddae..ff253aae2 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 8f846c5e0..3491909ae 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 8a27e5cc2..61eb6f39c 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 4d5263108..365b91eae 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 81a55b9e8..333c6c75b 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 58ee588b3..bc9ea0c50 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 364b76494..149b4a1b4 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 e096906a3..97694bcee 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 6a3416d53..daba38cbe 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 6a3416d53..daba38cbe 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 4c8ef9d8f..4279c6cd2 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 72411fee5..314a9fcd6 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 387251bdd..7a20fe006 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 9acc154ba..f95b9eb9c 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 7cf3aea02..a1a054299 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 839de4063..3f811a88d 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 850df8147..0c5672c8e 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 f4a12e663..15d3b76e0 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 c13606a5b..b4c02e4b4 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 a9396b92a..2d2955535 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 df3a49aa2..55e2033fc 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 c2e81af75..df69b379d 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/files/_mapdata/almalinux-8.yaml b/test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml index f4cc5f1d2..cb09ac59b 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 50b9765f3..e799cb273 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 f88f99001..e14e75caf 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 f26886464..27384e123 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 8812b2bf9..720533a80 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 8ba4d3b95..59b87ff26 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 cc943dc20..5857760da 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 5268881e5..1df4621a0 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 09bbae515..b8b3ea4c6 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 bd3784973..e5de1bba3 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 f4135030c..91198a8c2 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 a30de4a41..7636e9a9c 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 06e7de04d..f94035a6a 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 b5cbfc53d..bc68d6582 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 b5cbfc53d..bc68d6582 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 73c5c5c64..1ba3f7264 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 c7c1b23cb..135d2775d 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 d5c555b91..2d736835c 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 d5335cc77..b676d6a25 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 4eb7f7abc..8dc4437ef 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 2e086e895..7c58efa22 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 75e8fd12d..8facd4a75 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 122f6d68c..d67bd4ea6 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 636951574..b3c8e5e85 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 8eaaf3abc..cbc4ddac9 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"