Dzahn has submitted this change and it was merged.

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(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



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: merged
Gerrit-Change-Id: I488c3bdff6914a5420ec9950c9d9367dc05496dd
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to