BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234269
Change subject: Require ethtool package for ethtool execs
......................................................................
Require ethtool package for ethtool execs
This caused some exec failures during initial puppetization of
lvs2006 as jessie.
Change-Id: Ic04e42c20fc44ddd5322c0d7ba8c77b71dc1e69e
---
M modules/interface/manifests/offload.pp
M modules/interface/manifests/ring.pp
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/234269/1
diff --git a/modules/interface/manifests/offload.pp
b/modules/interface/manifests/offload.pp
index fb93cc3..67320eb 100644
--- a/modules/interface/manifests/offload.pp
+++ b/modules/interface/manifests/offload.pp
@@ -28,6 +28,7 @@
exec { "ethtool ${interface} -K ${setting} ${value}":
path => '/usr/bin:/usr/sbin:/bin:/sbin',
command => "ethtool -K ${interface} ${setting} ${value}",
- unless => "test $(ethtool -k ${interface} | awk '/${long_param}:/ {
print \$2 }') = '${value}'"
+ unless => "test $(ethtool -k ${interface} | awk '/${long_param}:/ {
print \$2 }') = '${value}'",
+ require => Package['ethtool'],
}
}
diff --git a/modules/interface/manifests/ring.pp
b/modules/interface/manifests/ring.pp
index 469c731..f2d597f 100644
--- a/modules/interface/manifests/ring.pp
+++ b/modules/interface/manifests/ring.pp
@@ -22,5 +22,6 @@
command => "ethtool -G ${interface} ${setting} ${value}",
subscribe => Augeas["${interface}_${title}"],
refreshonly => true,
+ require => Package['ethtool'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic04e42c20fc44ddd5322c0d7ba8c77b71dc1e69e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits