Fixed several issues in the interface state
Fixed:
* The udev-rules template is not tested
* Wrong unicode character in the template leads to udev ignoring
the rule completely
* The template is unable to be rendered due to absent import
* udev is not retrigerred with new rules
Change-Id: I134b5e49b883afcc5e34feaaa561d7ca70192796
Closes-Bug: PROD-16649
diff --git a/linux/files/60-net-txqueue.rules b/linux/files/60-net-txqueue.rules
index 7805c9c..8f6478c 100644
--- a/linux/files/60-net-txqueue.rules
+++ b/linux/files/60-net-txqueue.rules
@@ -1 +1 @@
-KERNEL==”tap[0-9a-z\-]*", RUN+="/sbin/ip link set %k txqueuelen {{ network.tap_custom_txqueuelen }}"
\ No newline at end of file
+KERNEL=="tap[0-9a-z\-]*", RUN+="/sbin/ip link set %k txqueuelen {{ tap_custom_txqueuelen }}"
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index ddcb8d8..ac84db4 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -373,5 +373,19 @@
- source: salt://linux/files/60-net-txqueue.rules
- mode: 755
- template: jinja
+ - defaults:
+ tap_custom_txqueuelen: {{ network.tap_custom_txqueuelen }}
+
+udev_reload_rules:
+ cmd.run:
+ - name: "/bin/udevadm control --reload-rules"
+ - onchanges:
+ - file: /etc/udev/rules.d/60-net-txqueue.rules
+
+udev_retrigger:
+ cmd.run:
+ - name: "/bin/udevadm trigger --attr-match=subsystem=net"
+ - onchanges:
+ - udev_reload_rules
{%- endif %}
diff --git a/tests/pillar/network_extended.sls b/tests/pillar/network_extended.sls
index 19587c9..e0e428d 100644
--- a/tests/pillar/network_extended.sls
+++ b/tests/pillar/network_extended.sls
@@ -8,6 +8,7 @@
hostname: linux
fqdn: linux.ci.local
network_manager: false
+ tap_custom_txqueuelen: 10000
interface:
eth0:
enabled: true