restart incron, fix isc-dhcp-server, no apparmor for Debian

salt/agentdriver/configuration.sls

@@ -37,7 +37,7 @@ incrond:
 incron:
 incron:
 {% endif %}
 {% endif %}
   service:
   service:
-    - reload: true
+    - full_restart: true
     - enable: true
     - enable: true
     - running
     - running
     - watch:
     - watch:

salt/fwdriver/configuration.sls

@@ -55,7 +55,7 @@ include:
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
 
 
-{% if grains['os_family'] != 'RedHat' %}
+{% if grains['os_family'] != 'RedHat' and grains['os'] != 'Debian' %}
 /etc/init.d/isc-dhcp-server:
 /etc/init.d/isc-dhcp-server:
   file.symlink:
   file.symlink:
     - target: /lib/init/upstart-job
     - target: /lib/init/upstart-job

salt/vmdriver/libvirt.sls

@@ -65,7 +65,7 @@ vmdriver_semodule:
       - file: /root/vmdriver.te
       - file: /root/vmdriver.te
       - pkg: selinux_pkgs
       - pkg: selinux_pkgs
 
 
-{% else %}
+{% elif grains['os'] != 'Debian' %}
 
 
 /etc/apparmor.d/libvirt/TEMPLATE:
 /etc/apparmor.d/libvirt/TEMPLATE:
   file.managed:
   file.managed: