Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312322

Change subject: contint: migrate castor server to /srv
......................................................................

contint: migrate castor server to /srv

Include role::ci::slave::labs::common directly instead of via the
wikitech role.  The castor server is always going to be a Jenkins slave.

Replace mnt with srv. The Mount['/srv'] being realized by
role::ci::slave::labs::common.

Change-Id: Ic79ca62324c3fa8a7ffca0142c425f0bb8093b91
---
M modules/role/manifests/ci/castor/server.pp
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/312322/1

diff --git a/modules/role/manifests/ci/castor/server.pp 
b/modules/role/manifests/ci/castor/server.pp
index 7314c72..4cc5a41 100644
--- a/modules/role/manifests/ci/castor/server.pp
+++ b/modules/role/manifests/ci/castor/server.pp
@@ -4,25 +4,25 @@
 class role::ci::castor::server {
     requires_realm( 'labs' )
 
-    include role::labs::lvm::mnt
+    require role::ci::slave::labs::common
+
     include rsync::server
 
-    file { '/mnt/jenkins-workspace/caches':
+    file { '/srv/jenkins-workspace/caches':
         ensure  => directory,
         owner   => 'jenkins-deploy',
         group   => 'wikidev',
         mode    => '0775',
-        require => Class['role::labs::lvm::mnt'],
+        require => Mount['/srv'],
     }
 
     rsync::server::module { 'caches':
-        path      => '/mnt/jenkins-workspace/caches',
+        path      => '/srv/jenkins-workspace/caches',
         read_only => 'yes',
         uid       => 'jenkins-deploy',
         gid       => 'wikidev',
         require   => [
-            File['/mnt/jenkins-workspace/caches'],
-            Class['role::labs::lvm::mnt'],
+            File['/srv/jenkins-workspace/caches'],
         ],
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/312322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic79ca62324c3fa8a7ffca0142c425f0bb8093b91
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

Reply via email to