Change conditions for xenial

salt/vmdriver/init.sls

@@ -53,7 +53,7 @@ vmdriver:
       {% endif %}
       {% endif %}
     - require_in:
     - require_in:
       - file: /etc/default/libvirt-bin
       - file: /etc/default/libvirt-bin
-      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
+      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
       - service: libvirtd
       - service: libvirtd
       {% else %}
       {% else %}
       - file: /etc/apparmor.d/libvirt/TEMPLATE
       - file: /etc/apparmor.d/libvirt/TEMPLATE

salt/vmdriver/libvirt.sls

@@ -15,7 +15,7 @@ libvirtconf:
   file.append:
   file.append:
     - text: libvirtd_opts="-d -l"
     - text: libvirtd_opts="-d -l"
 
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
 libvirtd:
 libvirtd:
 {% else %}
 {% else %}
 libvirt-bin:
 libvirt-bin:
@@ -68,7 +68,7 @@ vmdriver_semodule:
       - file: /root/vmdriver.te
       - file: /root/vmdriver.te
       - pkg: selinux_pkgs
       - pkg: selinux_pkgs
 
 
-{% elif grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
+{% elif grains['os'] == 'Debian' %}
 
 
 /usr/bin/kvm:
 /usr/bin/kvm:
   file.replace:
   file.replace: