chore(pr): adopt pr comments for minion

Author: noelmcloughlin

pillar.example

@@ -80,6 +80,7 @@ salt:
   # salt master config
   master_config_use_TOFS: true
   master:
+    standalone: false
     fileserver_backend:
       - git
       - s3fs
@@ -163,6 +164,9 @@ salt:
   minion_config_use_TOFS: true
   minion:
 
+    # standalone setup
+    master_type: false   # see init.sls & standalone.sls
+
     # single master setup
     master: salt
 

salt/defaults.yaml

@@ -29,16 +29,16 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
-  pkgrepo: None          # see osfamilymap
-  ssh_roster: None       # see pillar data
+  pkgrepo: ''          # see osfamilymap
+  ssh_roster: {}       # see pillar data
 
   python_git: python-git
   python_dulwich: python-dulwich
 
   master:
     gitfs_provider: gitpython
   minion:
-    master_type: true
+    master_type: true  # see init.sls & standalone.sls
 
   gitfs:
     dulwich:

salt/init.sls

@@ -15,8 +15,13 @@ include:
       {%- if salt.config.get('salt:ssh_roster') %}
   - salt.ssh
       {%- endif %}
-  - salt.standalone
+      {%- if salt.config.get('salt:minion')|length > 1 %}
+          {%- if salt.config.get('salt:minion:master_type') %}
   - salt.minion
+          {%- else %}
+  - salt.standalone
+          {%- endif %}
+      {%- endif %}
       {%- if salt.config.get('salt:api') %}
   - salt.api
       {%- endif %}

salt/standalone.sls

@@ -15,7 +15,7 @@ salt-minion-standalone:
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
     - context:
-  {%- if salt_settings.minion.master_type in ('disable', False) %}
+  {%- if not salt_settings.minion.master_type %}
         standalone: True
   service.running:
     - enable: True