6 changed files with 3 additions and 18 deletions
--- a/pillar/common.sls
+++ b/pillar/common.sls
@ -1,6 +1,4 @@
 include:
-  - role.salt.common
-  - role.salt.minion
  - secret.common

 managed_header_pound: |
--- a/pillar/role/salt/common.sls
+++ b/pillar/role/salt/common.sls
@ -1,2 +0,0 @@
-salt:
-  hash_type: sha512
--- a/pillar/role/salt/minion.sls
+++ b/pillar/role/salt/minion.sls
@ -1,11 +0,0 @@
-{%- set myconfig = pillar['netbox']['config_context'] -%}
-
-salt:
-  minion_remove_config: True
-  minion:
-    master_type: True
-    master: {{ myconfig['salt_master'] }}
-    {%- if 'roles' in myconfig and myconfig['roles'] | length > 0 %}
-    grains:
-      roles: {{ myconfig['roles'] }}
-    {%- endif %}
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@ -1,3 +1,3 @@
 include:
-  - role.salt.minion
+  - role.minion
  - common.{{ grains['os'] | lower }}
--- a/salt/role/minion.sls
+++ b/salt/role/minion.sls
@ -0,0 +1,2 @@
+include:
+  - profile.salt.grains
--- a/salt/role/salt/minion.sls
+++ b/salt/role/salt/minion.sls
@ -1,2 +0,0 @@
-include:
-  - salt.minion