Use custom minion master configuration

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

pillar/common.sls

@@ -1,4 +1,6 @@
 include:
+  - role.salt.common
+  - role.salt.minion
   - secret.common
 
 managed_header_pound: |

pillar/role/salt/common.sls

@@ -0,0 +1,2 @@
+salt:
+  hash_type: sha512

pillar/role/salt/minion.sls

@@ -0,0 +1,4 @@
+salt:
+  minion_remove_config: True
+  minion:
+    master_type: str

salt/common/init.sls

@@ -1,3 +1,3 @@
 include:
-  - role.minion
+  - role.salt.minion
   - common.{{ grains['os'] | lower }}

salt/profile/salt/grains.sls

@@ -6,10 +6,7 @@ salt_grains_file:
     - names:
       - /etc/salt/grains:
         - source: salt:///{{ slspath }}/files/etc/salt/grains.j2
-
-salt_restart_minion:
-  cmd.run:
-    - name: 'salt-call service.restart salt-minion'
-    - bg: True
-    - onchanges:
-      - file: salt_grains_file
+    - require_in:
+      - service: salt-minion
+    - watch_in:
+      - service: salt-minion

salt/profile/salt/minion.sls

@@ -0,0 +1,12 @@
+include:
+  - salt.minion
+  - .grains
+
+/etc/salt/minion.d/master.conf:
+  file.managed:
+    - contents:
+      - 'master: {{ salt['pillar.get']('netbox:config_context:salt_master') }}'
+    - require_in:
+      - service: salt-minion
+    - watch_in:
+      - service: salt-minion

salt/role/minion.sls

@@ -1,2 +0,0 @@
-include:
-  - profile.salt.grains

salt/role/salt/minion.sls

@@ -0,0 +1,2 @@
+include:
+  - profile.salt.minion