include salt state in salt.minion, manager salt-minion service in salt.minion state;

salt/salt/init.sls

@@ -1,20 +1,13 @@
-
-
 {% if grains['os'] != 'CentOS' %}    
 saltpymodules:
   pkg.installed:
     - pkgs:
       - python-docker
       - python-m2crypto
-  {% endif %}
+{% endif %}
 
 salt_bootstrap:
   file.managed:
     - name: /usr/sbin/bootstrap-salt.sh
     - source: salt://salt/scripts/bootstrap-salt.sh
     - mode: 755
-
-salt_minion_service:
-  service.running:
-    - name: salt-minion
-    - enable: True

salt/salt/minion.sls

@@ -1,4 +1,6 @@
-#Future state for Salt minions
+include:
+  - salt
+  
 {% import_yaml 'salt/minion.defaults.yaml' as salt %}
 {% set saltversion = salt.salt.minion.version %}
 
@@ -10,3 +12,8 @@ install_salt_minion:
     {% else %}
     - name: echo 'Already running Salt Minon version {{ saltversion }}'
     {% endif %}
+
+salt_minion_service:
+  service.running:
+    - name: salt-minion
+    - enable: True

salt/top.sls

@@ -24,7 +24,7 @@ base:
 
   '* and G@saltversion:{{saltversion}}':
     - match: compound
-    - salt
+    - salt.minion
     - docker
     - patch.os.schedule
     - motd