vmdriver

salt/vmdriver/configuration.sls

@@ -9,10 +9,11 @@ include:
     - group: {{ pillar['user'] }}
     - group: {{ pillar['user'] }}
     - mode: 700
     - mode: 700
 
 
-{% set service_dir = "/etc/systemd/system/" if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' else "/etc/init/" %}
+{% set service_dir = "/etc/systemd/system/" if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' else "/etc/init/" %}
 {% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service")
 {% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service")
                         if grains['os_family'] == 'RedHat' 
                         if grains['os_family'] == 'RedHat' 
-                        or grains['os'] == 'Debian' else
+                        or grains['os'] == 'Debian'
+                        or grains['osfinger'] == 'Ubuntu-16.04' else
                         ("vmcelery.conf", "netcelery.conf", "node.conf")) %}
                         ("vmcelery.conf", "netcelery.conf", "node.conf")) %}
 
 
 {% for file in service_files %}
 {% for file in service_files %}

salt/vmdriver/init.sls

@@ -32,7 +32,7 @@ vmdriver:
       - libxslt1-dev
       - libxslt1-dev
       - openvswitch-common
       - openvswitch-common
       - openvswitch-switch
       - openvswitch-switch
-      {% if grains['os'] != 'Debian' %}
+      {% if grains['os'] != 'Debian' and grains['osfinger'] != 'Ubuntu-16.04' %}
       {# No such package in Debian Jessie! #}
       {# No such package in Debian Jessie! #}
       - openvswitch-controller
       - openvswitch-controller
       {% endif %}
       {% endif %}