Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283678
Change subject: Reuse update-initramfs in lvs::balancer and interface::rps
......................................................................
Reuse update-initramfs in lvs::balancer and interface::rps
Reuse Exec['update-initramfs'], introduced in ebe9658, in
interface::rps::modparams and lvs::balancer.
Change-Id: Ib0f29e999d20aeb8957bcf46cdf4676b6124b85b
---
M modules/interface/manifests/rps.pp
M modules/lvs/manifests/balancer.pp
2 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/283678/1
diff --git a/modules/interface/manifests/rps.pp
b/modules/interface/manifests/rps.pp
index e4490ac..023e188 100644
--- a/modules/interface/manifests/rps.pp
+++ b/modules/interface/manifests/rps.pp
@@ -42,13 +42,10 @@
}
class interface::rps::modparams {
+ include initramfs
+
file { '/etc/modprobe.d/rps.conf':
content => template("${module_name}/rps.conf.erb"),
- notify => Exec['update-initramfs-rps']
- }
-
- exec { 'update-initramfs-rps':
- command => '/usr/sbin/update-initramfs -u',
- refreshonly => true
+ notify => Exec['update-initramfs']
}
}
diff --git a/modules/lvs/manifests/balancer.pp
b/modules/lvs/manifests/balancer.pp
index 9f2d144..b7062bf 100644
--- a/modules/lvs/manifests/balancer.pp
+++ b/modules/lvs/manifests/balancer.pp
@@ -18,6 +18,7 @@
include pybal
include pybal::confd
include cpufrequtils # defaults to "performance", Ubuntu default is
"ondemand"
+ include initramfs
# ethtool is also a package needed but it is included from base
@@ -33,12 +34,7 @@
owner => 'root',
group => 'root',
content => template('lvs/lvs.conf.erb'),
- notify => Exec['update-initramfs-lvs-balancer']
- }
-
- exec { 'update-initramfs-lvs-balancer':
- command => '/usr/sbin/update-initramfs -u',
- refreshonly => true
+ notify => Exec['update-initramfs']
}
# Bind balancer IPs to the loopback interface
--
To view, visit https://gerrit.wikimedia.org/r/283678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0f29e999d20aeb8957bcf46cdf4676b6124b85b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
