Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356108 )
Change subject: labstore: use the interface_primary fact, not eth0
......................................................................
labstore: use the interface_primary fact, not eth0
Don't hardcode eth0 in the traffic shaping script , but use the
interface_primary fact instead.
Change-Id: Ie34376044316acdf85fc26e3633c80a37f1c315c
---
M modules/labstore/manifests/traffic_shaping.pp
M modules/labstore/templates/tc-setup.sh.erb
2 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
Madhuvishy: Verified; Looks good to me, approved
diff --git a/modules/labstore/manifests/traffic_shaping.pp
b/modules/labstore/manifests/traffic_shaping.pp
index 742c152..ac94d88 100644
--- a/modules/labstore/manifests/traffic_shaping.pp
+++ b/modules/labstore/manifests/traffic_shaping.pp
@@ -2,7 +2,8 @@
$nfs_write = '8500kbps',
$nfs_read = '1000kbps',
$nfs_dumps_read = '15000kbps',
- $eth0_egress = '30000kbps',
+ $egress = '30000kbps',
+ $interface = $facts['interface_primary'],
) {
file { '/usr/local/sbin/tc-setup':
diff --git a/modules/labstore/templates/tc-setup.sh.erb
b/modules/labstore/templates/tc-setup.sh.erb
index dc9ca63..3e702a3 100644
--- a/modules/labstore/templates/tc-setup.sh.erb
+++ b/modules/labstore/templates/tc-setup.sh.erb
@@ -14,15 +14,16 @@
nfs_write='<%= @nfs_write %>'
nfs_read='<%= @nfs_read %>'
nfs_dumps_read='<%= @nfs_dumps_read %>'
-eth0_egress='<%= @eth0_egress %>'
+egress='<%= @egress %>'
+iface='<%= @interface %>'
function clean_ingress {
- tc qdisc del dev eth0 handle ffff: ingress
+ tc qdisc del dev $iface handle ffff: ingress
tc qdisc del dev ifb0 root
}
function clean_egress {
- tc qdisc del dev eth0 root
+ tc qdisc del dev $iface root
}
function ensure_mod {
@@ -49,34 +50,34 @@
clean_egress
-tc qdisc add dev eth0 root handle 1: htb default 100
+tc qdisc add dev $iface root handle 1: htb default 100
-tc class add dev eth0 parent 1: classid 1:1 htb rate $nfs_write
+tc class add dev $iface parent 1: classid 1:1 htb rate $nfs_write
-tc class add dev eth0 parent 1: classid 1:2 htb rate $nfs_write
+tc class add dev $iface parent 1: classid 1:2 htb rate $nfs_write
-tc class add dev eth0 parent 1: classid 1:3 htb rate $nfs_write
+tc class add dev $iface parent 1: classid 1:3 htb rate $nfs_write
-tc class add dev eth0 parent 1: classid 1:4 htb rate $nfs_write
+tc class add dev $iface parent 1: classid 1:4 htb rate $nfs_write
-tc class add dev eth0 parent 1: classid 1:5 htb rate $nfs_write
+tc class add dev $iface parent 1: classid 1:5 htb rate $nfs_write
-tc class add dev eth0 parent 1: classid 1:100 htb rate $eth0_egress
+tc class add dev $iface parent 1: classid 1:100 htb rate $egress
-tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev $iface parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.6 flowid 1:1
-tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev $iface parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.7 flowid 1:2
-tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev $iface parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.10 flowid 1:3
# scratch is on labstore1003 for now
-tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev $iface parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.4.10 flowid 1:4
-tc filter add dev eth0 parent 1: protocol ip prio 0 u32 \
+tc filter add dev $iface parent 1: protocol ip prio 0 u32 \
match ip dst 10.64.37.18 flowid 1:5
#-------------------------------------
@@ -84,7 +85,7 @@
clean_ingress
# Create ingress on external interface
-tc qdisc add dev eth0 handle ffff: ingress
+tc qdisc add dev $iface handle ffff: ingress
# this link has to come up for ingress shaping
/sbin/ip link set dev ifb0 up
@@ -97,7 +98,7 @@
fi
# pass engress traffic through ifb0
-tc filter add dev eth0 parent ffff: protocol all u32 \
+tc filter add dev $iface parent ffff: protocol all u32 \
match u32 0 0 action mirred egress redirect dev ifb0
tc qdisc add dev ifb0 root handle 1: htb
--
To view, visit https://gerrit.wikimedia.org/r/356108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie34376044316acdf85fc26e3633c80a37f1c315c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
