Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173511
Change subject: contint: Move tmpfs Require to caller to support labs'
jenkins-deploy
......................................................................
contint: Move tmpfs Require to caller to support labs' jenkins-deploy
The 'jenkins-deploy' user is in LDAP, so we can't reference that
username in puppet File sources (the user may not exist yet).
It doesn't have a User resource that can be required.
Change-Id: I4713ff77a7835ec5cd1dc000c85198732e40ed64
---
M manifests/role/ci.pp
M modules/contint/manifests/tmpfs.pp
2 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/173511/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 456bea6..e6f5d3e 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -169,6 +169,7 @@
group => 'jenkins-slave',
mount_point => '/var/lib/jenkins-slave/tmpfs',
size => '512M',
+ require => [ User['jenkins-slave'], Group['jenkins-slave'] ],
}
nrpe::monitor_service { 'ci_tmpfs':
description => 'CI tmpfs disk space',
diff --git a/modules/contint/manifests/tmpfs.pp
b/modules/contint/manifests/tmpfs.pp
index 2a030f5..40b6d4d 100644
--- a/modules/contint/manifests/tmpfs.pp
+++ b/modules/contint/manifests/tmpfs.pp
@@ -1,5 +1,6 @@
-# Wikimedia uses a small tmpfs disk to help soften I/O on the contint server.
-# A typical use cases are the MediaWiki sqlite files
+# Use a small tmpfs disk to help soften I/O on the contint slaves.
+# A typical use case is speeding up interaction with MediaWiki
+# sqlite database files in Jenkins jobs.
define contint::tmpfs(
$user = 'jenkins',
$group = 'jenkins',
@@ -7,13 +8,11 @@
$size = '512M',
) {
- # Setup tmpfs to write SQLite files to
file { $mount_point:
ensure => directory,
mode => '0755',
owner => $user,
group => $group,
- require => [ User[$user], Group[$group] ],
}
mount { $mount_point:
@@ -21,8 +20,7 @@
device => 'tmpfs',
fstype => 'tmpfs',
options =>
"noatime,defaults,size=${size},mode=755,uid=${user},gid=${group}",
- require => [ User[$user], Group[$group],
- File[$mount_point] ],
+ require => File[$mount_point],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/173511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4713ff77a7835ec5cd1dc000c85198732e40ed64
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
