Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Some extra improvements for check_eth
......................................................................
Some extra improvements for check_eth
* Dont check virtual interfaces
* Only complain if the autonegotiated speed is below 1Gbit
* Dont bail out but rather continue on unknown interfaces
* Cleanup a bit
Change-Id: Iae1f380705233a2fba4765049065665f6ba85bd4
---
M modules/base/templates/check_eth.erb
1 file changed, 9 insertions(+), 12 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/templates/check_eth.erb
b/modules/base/templates/check_eth.erb
index 49e7262..b587f9b 100644
--- a/modules/base/templates/check_eth.erb
+++ b/modules/base/templates/check_eth.erb
@@ -1,28 +1,25 @@
#!/bin/sh
EXIT_CODE=0
-for INTERFACE in <%= @interfaces.gsub(',', ' ') %> ; do
- IFACE=${INTERFACE%:*}
- REQ_SPEED=${INTERFACE#*:}
- if [ $IFACE = $REQ_SPEED ]; then
+for INTERFACE in <%= @interfaces.gsub(',', ' ').gsub(/\s\w+_\w+/,'') %> ; do
REQ_SPEED=1000 # The default for now
- fi
- STATUS=`ip link show ${IFACE}`
+ STATUS=`ip link show ${INTERFACE}`
if [ "$?" != "0" ]; then
- echo "${IFACE} not found. This should never happen. Bailing out"
- exit 1
+ echo "${INTERFACE} not found. This should never happen. Bailing
out"
+ EDIT_CODE=1
+ continue
fi
if echo ${STATUS} | grep -q "NO-CARRIER"
then
- echo "${IFACE} reporting no carrier."
+ echo "${INTERFACE} reporting no carrier."
EXIT_CODE=2
fi
if echo ${STATUS} | grep -q "DOWN"
then
continue
fi
- CONF_SPEED=$(/sbin/ethtool $IFACE | awk '/Speed:/
{gsub("Mb/s","",$2);print $2}')
- if [ $REQ_SPEED -ne $CONF_SPEED ]; then
- echo "${IFACE} has different negotiated speed than requested"
+ CONF_SPEED=$(/sbin/ethtool $INTERFACE | awk '/Speed:/
{gsub("Mb/s","",$2);print $2}')
+ if [ $CONF_SPEED -lt $REQ_SPEED ]; then
+ echo "${INTERFACE} has different negotiated speed than
requested"
EXIT_CODE=1
fi
done
--
To view, visit https://gerrit.wikimedia.org/r/124854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae1f380705233a2fba4765049065665f6ba85bd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
