Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311954
Change subject: contint: labs instance all have /dev/vdb
......................................................................
contint: labs instance all have /dev/vdb
The labs instance on pmtpa had all disk allocated. When we moved to
eqiad we needed a feature switch to mount the extended disk via lvm.
Nowadays, all instances are on eqiad and need the extended disk to be
mounted.
Adjust role::ci::slave::labs::common:
* Always require role::labs::lvm::mnt
* Drop $slash_mnt_require which was used to vary between Mount and File.
* Update a few obsolete comments
Change-Id: I488c3bdff6914a5420ec9950c9d9367dc05496dd
---
M modules/role/manifests/ci/slave/labs/common.pp
1 file changed, 7 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/311954/1
diff --git a/modules/role/manifests/ci/slave/labs/common.pp
b/modules/role/manifests/ci/slave/labs/common.pp
index 19ecaf0..b11bc9d 100644
--- a/modules/role/manifests/ci/slave/labs/common.pp
+++ b/modules/role/manifests/ci/slave/labs/common.pp
@@ -5,48 +5,29 @@
include contint::firewall::labs
include contint::packages::base
- if $::site == 'eqiad' {
- # Does not come with /dev/vdb, we need to mount it using lvm
- require role::labs::lvm::mnt
-
- # Will make sure /mnt is mounted before populating file there or they
- # might end up being being created locally and hidden by the mount.
- $slash_mnt_require = Mount['/mnt']
- } else {
- file { '/mnt':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0775',
- }
- $slash_mnt_require = File['/mnt']
- }
+ # Need the labs instance extended disk space
+ require role::labs::lvm::mnt
# Home dir for Jenkins agent
#
- # We will use neither /var/lib (partition too small) nor /home since it is
- # GlusterFS.
- #
- # Instead, create a work dir on /dev/vdb which has all the instance disk
- # space and is usually mounted on /mnt.
+ # /var/lib and /home are too small to hold Jenkins workspaces
file { '/mnt/jenkins-workspace':
ensure => directory,
owner => 'jenkins-deploy',
group => 'wikidev', # useless, but we need a group
mode => '0775',
- require => $slash_mnt_require,
+ require => Mount['/mnt'],
}
- # Create a homedir for `jenkins-deploy` so it does not end up being created
- # on /home which is using GlusterFS on the integration project. The user
is
- # only LDAP and is not created by puppet
+ # Create a homedir for `jenkins-deploy` so we get plenty of disk space.
+ # The user is only LDAP and is not created by puppet
# T63144
file { '/mnt/home':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
- require => $slash_mnt_require,
+ require => Mount['/mnt'],
}
file { '/mnt/home/jenkins-deploy':
@@ -78,4 +59,3 @@
include jenkins::slave::requisites
}
-
--
To view, visit https://gerrit.wikimedia.org/r/311954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I488c3bdff6914a5420ec9950c9d9367dc05496dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
