Update conditions for xenial

salt/agentdriver/configuration.sls

@@ -13,7 +13,7 @@
     - user: root
     - group: root
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/agentdriver.service:
   file.managed:
     - user: root

salt/fwdriver/configuration.sls

@@ -9,7 +9,7 @@ include:
     - group: {{ pillar['fwdriver']['user'] }}
     - mode: 700
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %} 
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/firewall.service:
   file.managed:
     - user: root
@@ -30,7 +30,7 @@ include:
     - group: root
     - template: jinja
     - source: file:///home/{{ pillar['fwdriver']['user'] }}/fwdriver/miscellaneous/firewall.conf
-    
+
 /etc/init/firewall-init.conf:
   file.managed:
     - user: root
@@ -55,7 +55,7 @@ include:
     - user: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
 
-{% if grains['os_family'] != 'RedHat' and grains['os'] != 'Debian' %}
+{% if grains['os_family'] != 'RedHat' and grains['os'] != 'Debian' and grains['os'] != 'Ubuntu' and grains['oscodename'] != 'xenial' %}
 /etc/init.d/isc-dhcp-server:
   file.symlink:
     - target: /lib/init/upstart-job
@@ -77,7 +77,7 @@ include:
     - source: salt://fwdriver/files/sudoers
 
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 systemd-sysctl:
   cmd.run:
     - name: /bin/systemctl restart systemd-sysctl
@@ -111,4 +111,3 @@ firewall-init_semodule:
       - file: /root/firewall-init.te
       - pkg: firewall-selinux_pkgs
 {% endif %}
-

salt/fwdriver/network.sls

@@ -13,7 +13,7 @@ vm:
     - pre_up_cmds:
       {% if grains['os_family'] == 'RedHat' %}
       - /bin/systemctl restart openvswitch
-      {% elif grains['os'] == 'Debian' %}
+      {% elif grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
       - /bin/systemctl restart openvswitch-switch
       {% else %}
       - /etc/init.d/openvswitch-switch restart
@@ -24,7 +24,7 @@ vm:
 
 {# -- DHCP server configuration -- #}
 
-{% if grains['os'] == 'Debian' %}
+{% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 symlink_dhcpd:
   file.symlink:
     - name: /etc/init.d/dhcpd
@@ -42,7 +42,7 @@ fix_dhcp:
     - name: salt://fwdriver/files/fix_dhcp.sh
 {% endif %}
 
-{% if grains['os'] == 'Debian' %}
+{% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 {# For next reboot #}
 after_openvswitch_conf:
   file.managed:

salt/graphite/configuration.sls

@@ -7,7 +7,7 @@ postactivate:
       - group: {{ pillar['graphite']['user'] }}
       - mode: 700
 
-requirements:  
+requirements:
   file.managed:
       - name: /home/{{ pillar['graphite']['user'] }}/requirements.txt
       - template: jinja
@@ -16,8 +16,8 @@ requirements:
       - group: {{ pillar['graphite']['user'] }}
       - require:
         - user: {{ pillar['graphite']['user'] }}
-  
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 
 /etc/systemd/system/graphite.service:
   file.managed:

salt/manager/configuration.sls

@@ -8,7 +8,7 @@ manager_postactivate:
 
 portal.conf:
   file.managed:
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
     - name: /etc/systemd/system/portal.service
     {% else %}
     - name: /etc/init/portal.conf
@@ -16,16 +16,16 @@ portal.conf:
     - user: root
     - group: root
     - template: jinja
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 
     {% if pillar['deployment_type'] == 'production' %}
     - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service
     {% else %}
     - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal.service
     {% endif %}
-    
+
     {% else %}
-    
+
     {% if pillar['deployment_type'] == 'production' %}
     - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.conf
     {% else %}
@@ -34,7 +34,7 @@ portal.conf:
 
     {% endif %}
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/manager.service:
   file.managed:
     - user: root

salt/manager/init.sls

@@ -53,14 +53,14 @@ manager:
       {% else %}
       - sudo
       {% endif %}
-     
+
 
   service:
     - running
     - enable: True
     - watch:
       - file: manager_postactivate
-      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
       - file: /etc/systemd/system/manager.service
       - file: /etc/systemd/system/managercelery@.service
       {% else %}

salt/monitor-client/configuration.sls

@@ -6,7 +6,7 @@
     - group: {{ pillar['user'] }}
     - mode: 700
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/monitor-client.service:
   file.managed:
     - user: root

salt/storagedriver/configuration.sls

@@ -6,7 +6,7 @@
     - group: {{ pillar['user'] }}
     - mode: 700
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/storagecelery@.service:
   file.managed:
     - user: root
@@ -52,4 +52,3 @@
     - mode: 755
     - require:
       - file: /datastore
-

salt/vmdriver/configuration.sls

@@ -9,10 +9,11 @@ include:
     - group: {{ pillar['user'] }}
     - 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['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' else "/etc/init/" %}
 {% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service")
                         if grains['os_family'] == 'RedHat' 
-                        or grains['os'] == 'Debian' else
+                        or grains['os'] == 'Debian'
+                        or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' else
                         ("vmcelery.conf", "netcelery.conf", "node.conf")) %}
 
 {% for file in service_files %}

salt/vmdriver/init.sls

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

salt/vmdriver/libvirt.sls

@@ -15,7 +15,7 @@ libvirtconf:
   file.append:
     - text: libvirtd_opts="-d -l"
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 libvirtd:
 {% else %}
 libvirt-bin:
@@ -23,7 +23,7 @@ libvirt-bin:
   service:
     - running
     - watch:
-      - file: /etc/default/libvirt-bin      
+      - file: /etc/default/libvirt-bin
       - augeas: libvirtconf
       {% if grains['os_family'] == 'RedHat' %}
       - file: /etc/sysconfig/libvirtd
@@ -68,7 +68,7 @@ vmdriver_semodule:
       - file: /root/vmdriver.te
       - pkg: selinux_pkgs
 
-{% elif grains['os'] == 'Debian' %}
+{% elif grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 
 /usr/bin/kvm:
   file.replace:
@@ -150,5 +150,3 @@ open_libvirt_ports:
   file.append:
     - text: LIBVIRTD_ARGS="--listen"
 {% endif %}
-
-

salt/vmdriver/virtualenv.sls

@@ -9,7 +9,7 @@ virtualenv_vmdriver:
 
 {% set targets = { 'libvirtmod_qemu.so': 'libvirtmod_qemu.x86_64-linux-gnu.so',
                    'libvirtmod.so': 'libvirtmod.x86_64-linux-gnu.so'
-                 } if grains['os'] == 'Debian' else {} %}
+                 } if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' else {} %}
 
 {% for file in ("libvirtmod_qemu.so", "libvirtmod.so", "libvirt_qemu.py", "libvirt.py", "libvirt_qemu.pyc", "libvirt.pyc") %}
 /home/{{ pillar['user'] }}/.virtualenvs/vmdriver/lib/python2.7/site-packages/{{ file }}:

salt/vncproxy/configuration.sls

@@ -6,7 +6,7 @@
     - group: {{ pillar['user'] }}
     - mode: 700
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}
 /etc/systemd/system/vncproxy.service:
   file.managed:
     - user: root