random fixes

salt/agentdriver/configuration.sls

@@ -10,7 +10,8 @@
   file.managed:
   file.managed:
     - source: salt://agentdriver/files/agentdriver.incron
     - source: salt://agentdriver/files/agentdriver.incron
     - template: jinja
     - template: jinja
-    - user: {{ pillar['user'] }}
+    - user: root
+    - group: root
 
 
 /etc/init/agentdriver.conf:
 /etc/init/agentdriver.conf:
   file.managed:
   file.managed:
@@ -18,10 +19,3 @@
     - group: root
     - group: root
     - template: jinja
     - template: jinja
     - source: file:///home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.conf
     - source: file:///home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.conf
-
-/var/lib/libvirt/serial:
-  file.directory:
-    - makedirs: True
-    - user: libvirt-qemu
-    - group: kvm
-    - mode: 755

salt/vmdriver/init.sls

@@ -26,6 +26,11 @@ vmdriver:
       - qemu-kvm
       - qemu-kvm
       - qemu-utils
       - qemu-utils
     - require_in:
     - require_in:
+      - file: /etc/default/libvirt-bin
+      - file: /etc/apparmor.d/libvirt/TEMPLATE
+      - file: /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
+      - file: /var/lib/libvirt/serial
+      - augeas: libvirtconf
       - service: libvirt-bin
       - service: libvirt-bin
       - git: gitrepo_vmdriver
       - git: gitrepo_vmdriver
       - virtualenv: virtualenv_vmdriver
       - virtualenv: virtualenv_vmdriver

salt/vmdriver/libvirt.sls

@@ -28,3 +28,18 @@ libvirt-bin:
     - source: salt://vmdriver/files/usr.lib.libvirt.virt-aa-helper
     - source: salt://vmdriver/files/usr.lib.libvirt.virt-aa-helper
     - template: jinja
     - template: jinja
     - mode: 644
     - mode: 644
+
+apparmor:
+  service:
+    - reload: true
+    - running
+    - watch:
+      - file: /etc/apparmor.d/libvirt/TEMPLATE
+      - file: /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
+
+/var/lib/libvirt/serial:
+  file.directory:
+    - makedirs: True
+    - user: libvirt-qemu
+    - group: kvm
+    - mode: 755