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

fix(Defaults) master_type: str

Merge pull request #492 from dth202/defaults-patch-1
fix(Defaults) master_type: str
0f725810 · Imran Iqbal · GitHub · bd345883 · c16e7a3b · 0f725810
Unverified Commit 0f725810 authored Sep 04, 2021 by Imran Iqbal Committed by GitHub Sep 04, 2021
--- 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

--- 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:

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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"

--- 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