BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188268
Change subject: move bnx2x num_queues from lvs::balancer to interface::rps
......................................................................
move bnx2x num_queues from lvs::balancer to interface::rps
Change-Id: If632f51a0b5c6c7c4c3f44b783d5aa3e10a22716
---
M modules/interface/manifests/rps.pp
A modules/interface/templates/rps.conf.erb
M modules/lvs/manifests/balancer.pp
M modules/lvs/templates/lvs.conf.erb
4 files changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/188268/1
diff --git a/modules/interface/manifests/rps.pp
b/modules/interface/manifests/rps.pp
index 5052eed..938661b 100644
--- a/modules/interface/manifests/rps.pp
+++ b/modules/interface/manifests/rps.pp
@@ -12,6 +12,7 @@
# (on bnx2x, this would be "eth0-fp-%d")
define interface::rps( $rss_pattern="" ) {
require interface::rpstools
+ require interface::rps::modparams
$interface = $title
$cmd = "/usr/local/sbin/interface-rps $interface $rss_pattern"
@@ -34,3 +35,15 @@
refreshonly => true,
}
}
+
+class interface::rps::modparams {
+ 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
+ }
+}
diff --git a/modules/interface/templates/rps.conf.erb
b/modules/interface/templates/rps.conf.erb
new file mode 100644
index 0000000..edd52cf
--- /dev/null
+++ b/modules/interface/templates/rps.conf.erb
@@ -0,0 +1,2 @@
+# This file is managed by Puppet!
+options bnx2x num_queues=<%= @physicalcorecount %>
diff --git a/modules/lvs/manifests/balancer.pp
b/modules/lvs/manifests/balancer.pp
index d591a6a..d18f964 100644
--- a/modules/lvs/manifests/balancer.pp
+++ b/modules/lvs/manifests/balancer.pp
@@ -31,10 +31,10 @@
file { "/etc/modprobe.d/lvs.conf":
content => template("${module_name}/lvs.conf.erb"),
- notify => Exec["update-initramfs"]
+ notify => Exec["update-initramfs-lvs-balancer"]
}
- exec { "update-initramfs":
+ exec { "update-initramfs-lvs-balancer":
command => "/usr/sbin/update-initramfs -u",
refreshonly => true
}
diff --git a/modules/lvs/templates/lvs.conf.erb
b/modules/lvs/templates/lvs.conf.erb
index f28cae9..8c1428a 100644
--- a/modules/lvs/templates/lvs.conf.erb
+++ b/modules/lvs/templates/lvs.conf.erb
@@ -1,3 +1,2 @@
# This file is managed by Puppet!
options ip_vs conn_tab_bits=20
-options bnx2x num_queues=<%= @physicalcorecount %>
--
To view, visit https://gerrit.wikimedia.org/r/188268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If632f51a0b5c6c7c4c3f44b783d5aa3e10a22716
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
