Bläddra i källkod

network: Remove UDEV rules used on Jessie machines.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 3 år sedan
förälder
incheckning
c0639d311a
2 ändrade filer med 0 tillägg och 23 borttagningar
  1. 0 12
      network/link.sls
  2. 0 11
      network/udev-rules.tmpl

+ 0 - 12
network/link.sls

@@ -2,16 +2,6 @@
 # Networking / link
 #
 
-{% if grains['oscodename'] == 'jessie' %}
-# Udev rules
-/etc/udev/rules.d/42-ffho-net.rules:
-  file.managed:
-    - template: jinja
-    - source: salt://network/udev-rules.tmpl
-
-# Stretch, Buster, ...
-{% else %}
-
 # Write an systemd link file for every interface with a MAC
   {% for iface, iface_config in salt['pillar.get']('nodes:' ~ grains['id'] ~ ':ifaces', {}).items ()|sort %}
     {% if 'mac' in iface_config %}
@@ -26,8 +16,6 @@
       - cmd: update-initramfs
     {% endif %}
   {% endfor %}
-{% endif %}
-
 
 # Rebuild initrd files if neccessary
 update-initramfs:

+ 0 - 11
network/udev-rules.tmpl

@@ -1,11 +0,0 @@
-#
-# FFHO net rules (Salt managed)
-#
-{%- for iface, iface_config in salt['pillar.get']('nodes:' ~ grains['id'] ~ ':ifaces', {}).items ()|sort %}
-  {%- if 'mac' in iface_config %}
-    {%- set mac = iface_config.get ('mac') -%}
-# {{ iface_config.get ('desc', '') }}
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="{{ mac }}", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="{{ iface }}"
-
-  {%- endif %}
-{%- endfor %}