Lcarr has submitted this change and it was merged.
Change subject: Replace generic::sysctl::high-bandwidth-rsync
......................................................................
Replace generic::sysctl::high-bandwidth-rsync
Now use sysctlfile::high-bandwidth-rsync
Change-Id: I0dc667180374b3afd9dd393ac36704ed1121a55d
---
M manifests/generic-definitions.pp
M manifests/misc/download.pp
M manifests/role/mirror.pp
M manifests/site.pp
A modules/sysctlfile/manifests/high-bandwidth-rsync.pp
5 files changed, 11 insertions(+), 17 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 1b0b077..fb71c00 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -816,20 +816,6 @@
}
}
-class generic::sysctl::high-bandwidth-rsync($ensure="present") {
- if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
- file { high-bandwidth-rsync-sysctl:
- name => "/etc/sysctl.d/60-high-bandwidth-rsync.conf",
- mode => 0444,
- notify => Exec["/sbin/start procps"],
- source =>
"puppet:///files/misc/60-high-bandwidth-rsync.conf.sysctl",
- ensure => $ensure
- }
- } else {
- alert("Distribution on $hostname does not support
/etc/sysctl.d/ files yet.")
- }
-}
-
class generic::sysfs::enable-rps {
upstart_job { "enable-rps": install => "true", start => "true" }
}
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index e26ce96..5ea5cd2 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -55,7 +55,7 @@
require => [ Package[nfs-kernel-server], File["/etc/exports"] ],
}
- include generic::sysctl::high-bandwidth-rsync
+ include sysctlfile::high-bandwidth-rsync
monitor_service { "lighttpd http": description => "Lighttpd HTTP",
check_command => "check_http" }
monitor_service { "nfs": description => "NFS", check_command =>
"check_tcp!2049" }
diff --git a/manifests/role/mirror.pp b/manifests/role/mirror.pp
index f90c753..57e4e63 100644
--- a/manifests/role/mirror.pp
+++ b/manifests/role/mirror.pp
@@ -9,7 +9,7 @@
ensure => latest;
}
- include generic::sysctl::high-bandwidth-rsync
+ include sysctlfile::high-bandwidth-rsync
}
class role::mirror::media {
diff --git a/manifests/site.pp b/manifests/site.pp
index 1440424..3ee41d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -812,7 +812,7 @@
# base_analytics_logging_node is defined in role/logging.pp
node "emery.wikimedia.org" inherits "base_analytics_logging_node" {
include
- generic::sysctl::high-bandwidth-rsync,
+ sysctlfile::high-bandwidth-rsync,
admins::mortals,
# RT 4312
accounts::milimetric
diff --git a/modules/sysctlfile/manifests/high-bandwidth-rsync.pp
b/modules/sysctlfile/manifests/high-bandwidth-rsync.pp
new file mode 100644
index 0000000..ee71f19
--- /dev/null
+++ b/modules/sysctlfile/manifests/high-bandwidth-rsync.pp
@@ -0,0 +1,8 @@
+# sysctl values for high bandwidth rsyn
+class sysctlfile::high-bandwidth-rsync($ensure="present") {
+ sysctlfile {'high-bandwidth-rsync':
+ source => 'puppet:///modules/sysctlfile/60-high-bandwidth-rsync.conf',
+ ensure => $ensure,
+ notify => Exec["/sbin/start procps"],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/74802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0dc667180374b3afd9dd393ac36704ed1121a55d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
