network

salt/network/init.sls

@@ -21,18 +21,6 @@ vm:
     - require:
     - require:
       - cmd: ovs-if
       - cmd: ovs-if
 
 
-{% if grains['os'] == 'Debian' %}
-symlink_dhcpd:
-  file.symlink:
-    - name: /etc/init.d/dhcpd
-    - target: /etc/init.d/isc-dhcp-server
-    - force: True
-  cmd.run:
-    - name: /bin/systemctl daemon-reload
-    - require:
-      - file: symlink_dhcpd
-{% endif %}
-
 firewall2:
 firewall2:
   service:
   service:
     - name: firewall
     - name: firewall
@@ -69,13 +57,13 @@ fix_dhcp:
 {% endif %}
 {% endif %}
 
 
 isc-dhcp-server:
 isc-dhcp-server:
-  {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+  {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
   cmd.run:
   cmd.run:
     - name: /bin/systemctl restart dhcpd
     - name: /bin/systemctl restart dhcpd
     {% if grains['os_family'] == 'RedHat' %}
     {% if grains['os_family'] == 'RedHat' %}
     - watch:
     - watch:
       - cmd: fix_dhcp
       - cmd: fix_dhcp
-    {% elif grains['os'] == 'Debian' %}
+    {% elif grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
     - watch:
     - watch:
       - cmd: fix_dhcp_daemon_reload
       - cmd: fix_dhcp_daemon_reload
     {% endif %}
     {% endif %}
@@ -85,17 +73,17 @@ isc-dhcp-server:
     {% if grains['os_family'] == 'RedHat' %}
     {% if grains['os_family'] == 'RedHat' %}
     - watch:
     - watch:
       - cmd: fix_dhcp
       - cmd: fix_dhcp
-    {% elif grains['os'] == 'Debian' %}
+    {% elif grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
     - watch:
     - watch:
       - cmd: fix_dhcp_daemon_reload
       - cmd: fix_dhcp_daemon_reload
     {% endif %}
     {% endif %}
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
     - name: dhcpd
     - name: dhcpd
     - require:
     - require:
       - cmd: isc-dhcp-server
       - cmd: isc-dhcp-server
     {% endif %}
     {% endif %}
 
 
-{% if grains['os'] == 'Debian' %}
+{% if grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
 {# For next reboot #}
 {# For next reboot #}
 after_openvswitch_conf:
 after_openvswitch_conf:
   file.managed:
   file.managed: