Andrew Bogott has submitted this change and it was merged.
Change subject: Dont check speed on ifaces that dont report one
......................................................................
Dont check speed on ifaces that dont report one
Also fix a typo (EDIT_CODE vs EXIT_CODE)
Change-Id: Iad58b129f9e81b3c2fad5a2f905cfdfdec2232e1
---
M modules/base/templates/check_eth.erb
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/base/templates/check_eth.erb
b/modules/base/templates/check_eth.erb
index 507bc55..db8035a 100644
--- a/modules/base/templates/check_eth.erb
+++ b/modules/base/templates/check_eth.erb
@@ -5,7 +5,7 @@
STATUS=`ip link show ${INTERFACE}`
if [ "$?" != "0" ]; then
echo "${INTERFACE} not found. This should never happen. Bailing
out"
- EDIT_CODE=1
+ EXIT_CODE=1
continue
fi
if echo ${STATUS} | grep -q "NO-CARRIER"
@@ -18,9 +18,11 @@
continue
fi
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
+ if [ -n "$CONF_SPEED" ]; then
+ if [ $CONF_SPEED -lt $REQ_SPEED ]; then
+ echo "${INTERFACE} has different negotiated speed than
requested"
+ EXIT_CODE=1
+ fi
fi
done
exit $EXIT_CODE
--
To view, visit https://gerrit.wikimedia.org/r/125734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad58b129f9e81b3c2fad5a2f905cfdfdec2232e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
